Merge remote-tracking branch 'upstream/master' into fetch_datasets

2 files changed, 21 insertions, 15 deletions

diff --git a/.github/for_maintainers/tests_strategy.md b/.github/for_maintainers/tests_strategy.md
index 2bba3f42..338d4282 100644
--- a/.github/for_maintainers/tests_strategy.md
+++ b/.github/for_maintainers/tests_strategy.md
@@ -8,7 +8,7 @@ The aim is to help maintainers to anticipate third parties modifications, update
 
 ### Linux
 
-As all the third parties are already installed (thanks to docker), the compilations has been separated by categories to be parallelized:
+As all the third parties are already installed (thanks to docker), the compilations have been separated in categories to be parallelized:
 
 * examples (C++)
 * tests (C++)
@@ -25,9 +25,9 @@ Without CGAL, and, with or without Eigen builds are performed inside the docker
 
 #### Update docker images
 
-C++ third parties installation are done thanks to apt on Ubuntu latest LTS.
+C++ third parties installation is done thanks to apt on Ubuntu latest LTS.
 
-Docker images need to be rebuild and push each time `.github/build-requirements`, `.github/test-requirements`, when a new third party is added, when a new CGAL version improves gudhi performances, ...
+Docker images need to be rebuilt and pushed each time `.github/build-requirements`, `.github/test-requirements`, when a new third party is added, when a new CGAL version improves gudhi performances, ...
 
 ```bash
 docker build -f Dockerfile_for_circleci_image -t gudhi/ci_for_gudhi:latest .
@@ -39,22 +39,24 @@ docker push gudhi/ci_for_gudhi_wo_cgal:latest
 
 ### Windows
 
-The compilations has been separated by categories to be parallelized, but I don't know why builds are not run in parallel:
+The compilations are not parallelized, as installation time (about 30 minutes) is too much compared to
+build and tests timings (about 30 minutes). Builds and tests include:
 
 * examples (C++)
 * tests (C++)
 * utils (C++)
 * python (here the WITH_GUDHI_REMOTE_TEST option is enabled which adds datasets fetching test)
 
-Doxygen (C++) is not tested.
-(cf. `.appveyor.yml`)
+Doxygen (C++) is not generated.
+(cf. `azure-pipelines.yml`)
 
-C++ third parties installation are done thanks to [vcpkg](https://github.com/microsoft/vcpkg/).
-In case of installation issue, check in [vcpkg issues](https://github.com/microsoft/vcpkg/issues).
+C++ third parties installation is done thanks to [vcpkg](https://github.com/microsoft/vcpkg/).
+In case of an installation issue, check in [vcpkg issues](https://github.com/microsoft/vcpkg/issues).
 
 ### OSx
 
-The compilations has been separated by categories to be parallelized:
+The compilations are not parallelized, but they should, as installation time (about 4 minutes) is
+negligible compared to build and tests timings (about 30 minutes). Builds and tests include:
 
 * examples (C++)
 * tests (C++)
@@ -64,8 +66,8 @@ The compilations has been separated by categories to be parallelized:
 
 (cf. `azure-pipelines.yml`)
 
-C++ third parties installation are done thanks to [brew](https://formulae.brew.sh/formula/).
-In case of installation issue, check in formula issues.
+C++ third parties installation is done thanks to [brew](https://formulae.brew.sh/formula/).
+In case of an installation issue, check in formula issues.
 
 ## Pip packaging
 
@@ -78,9 +80,9 @@ Only the Linux pip package is based on a docker image (`gudhi/pip_for_gudhi` bas
 
 ### Update docker image
 
-C++ third parties installation are done thanks to yum on an image based on `quay.io/pypa/manylinux2014_x86_64`.
+C++ third parties installation is done thanks to yum on an image based on `quay.io/pypa/manylinux2014_x86_64`.
 
-Docker image need to be rebuild and push each time `.github/build-requirements`, when a new third party is added, when a new CGAL version improves gudhi performances, ...
+Docker image needs to be rebuilt and pushed each time `.github/build-requirements`, when a new third party is added, when a new CGAL version improves gudhi performances, ...
 As `.github/test-requirements` is not installed, no need to rebuild image when this file is modified.
 
 ```bash
diff --git a/.github/next_release.md b/.github/next_release.md
index 0a8b2bbb..65a92816 100644
--- a/.github/next_release.md
+++ b/.github/next_release.md
@@ -6,8 +6,12 @@ We are now using GitHub to develop the GUDHI library, do not hesitate to [fork t
 
 Below is a list of changes made since GUDHI 3.5.0:
 
-- [Module](link)
-     - ...
+- [Alpha complex](https://gudhi.inria.fr/python/latest/alpha_complex_user.html)
+     - the python weighted version for alpha complex is now available in any dimension D.
+     - `alpha_complex = gudhi.AlphaComplex(off_file='/data/points/tore3D_300.off')` is deprecated, please use [read_points_from_off_file](https://gudhi.inria.fr/python/latest/point_cloud.html#gudhi.read_points_from_off_file) instead.
+
+- [Representations](https://gudhi.inria.fr/python/latest/representations.html#gudhi.representations.vector_methods.BettiCurve)
+     - A more flexible Betti curve class capable of computing exact curves
 
 - [Module](link)
      - ...