Double the jobs for macos x pyfaust pip package (build and test) to support...

Double the jobs for macos x pyfaust pip package (build and test) to support two versions of python (3.7 and 3.9).

.gitlab-ci.yml

@@ -4,6 +4,7 @@ variables:
     # Warning: DURL is the base url without the filename
     DURL: "https://gitlab.inria.fr/faustgrp/gforge_files/-/raw/master/"
     DFILE: "faust_data-2.6.0.zip"
+    JOB_PYTHON: "python3" # if set again in job, it hides this one (precedence: https://docs.gitlab.com/13.6/ee/ci/variables/#priority-of-environment-variables)
 
 .ctest_template: &ctest_script
     script:
@@ -322,8 +323,8 @@ pages:
         - 'cmake -DBUILD_WRAPPER_PYTHON=ON -DBUILD_WRAPPER_MATLAB=OFF -DBUILD_DOCUMENTATION=ON -DCPACK_PACKAGE_VERSION=$VERSION -DCMAKE_INSTALL_PREFIX=/opt/local/faust-$SHA_START -DBUILD_TESTING=OFF -DEXCLUDE_FAUST_LIB_INSTALL=ON -DUSE_MATIO_STATIC_LIBS=ON -DMATIO_STATIC_LIB_PATH=$MATIO_STATIC_LIB_PATH -DZ_STATIC_LIB_PATH=$Z_STATIC_LIB_PATH -DHDF5_STATIC_LIB_PATH=$HDF5_STATIC_LIB_PATH -DREMOTE_DATA_URL="$DURL" -DREMOTE_DATA_FILE="$DFILE" -DEXPERIMENTAL_PKG=$EXPERIMENTAL_PKG -DFAUST_TORCH=$FAUST_TORCH -DCMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH" -DNOPY2=$NOPY2 -DBUILD_MULTITHREAD=$BUILD_MULTITHREAD -DUSE_GPU_MOD=$USE_GPU_MOD -DEXPERIMENTAL_PKG=$EXPERIMENTAL_PKG -DFAUST_TORCH=$FAUST_TORCH ..'
         - make
         - cd wrapper/python
-        - python3 setup.py bdist_wheel
-        - python3 setup.py bdist_egg
+        - $JOB_PYTHON setup.py bdist_wheel
+        - $JOB_PYTHON setup.py bdist_egg
         - if [[ "$NOPY2" != "ON" ]]; then python2 setup.py bdist_wheel; fi
         - if [[ "$NOPY2" != "ON" ]]; then python2 setup.py bdist_egg; fi
     artifacts:
@@ -391,6 +392,12 @@ pkg_macos_purepy_release:
     tags:
         - macos
 
+pkg_macos_purepy_release_extra_pyver:
+    extends: .pkg_purepy_release
+    variables: {MATIO_STATIC_LIB_PATH: "/usr/local/lib/libmatio.a", Z_STATIC_LIB_PATH: "/opt/local/lib/libz.a", HDF5_STATIC_LIB_PATH: "/opt/local/lib/libhdf5.a", BUILD_MULTITHREAD: "ON", FAUST_TORCH: "OFF", EXPERIMENTAL_PKG: "OFF", NOPY2: "ON", PYTHON_PATH: '/opt/local/bin/python3.9', JOB_PYTHON: 'python3.9'}
+    tags:
+        - macos
+
 pkg_macos_purepy_release_torch_linked:
     extends: pkg_macos_purepy_release
     variables: {GIT_SUBMODULE_STRATEGY: recursive, MATIO_STATIC_LIB_PATH: "/usr/local/lib/libmatio.a", Z_STATIC_LIB_PATH: "/opt/local/lib/libz.a", HDF5_STATIC_LIB_PATH: "/opt/local/lib/libhdf5.a", FAUST_TORCH: "ON", CMAKE_PREFIX_PATH: "/opt/local/libtorch/share/cmake/Torch", BUILD_MULTITHREAD: "ON", EXPERIMENTAL_PKG: "OFF", NOPY2: "ON"}
@@ -503,7 +510,8 @@ test_macos_pkg_release:
   script:
     - $JOB_PYTHON -m venv test_pyfaust-$CI_COMMIT_TAG
     - source test_pyfaust-$CI_COMMIT_TAG/bin/activate
-    - pip install build/wrapper/python/dist/pyfaust-$CI_COMMIT_TAG-*.whl
+    - PYVER=$($JOB_PYTHON --version | awk '{print $2}' | sed -e 's/\.//g;s/\(..\).*/\1/')
+    - $JOB_PYTHON -m pip install --upgrade build/wrapper/python/dist/pyfaust-$CI_COMMIT_TAG-*$PYVER*.whl
     - $JOB_PYTHON -c "import pyfaust; print(pyfaust.version()); print(pyfaust.rand(5,5).toarray());"
     - $JOB_PYTHON -c "import pyfaust.tests; pyfaust.tests.run_tests('cpu', 'real')"
   only:
@@ -519,6 +527,16 @@ test_macos_purepy_release:
     - macos
     - macos_pkg_tester
 
+test_macos_purepy_release_extra_pyver:
+  variables: {JOB_PYTHON: 'python3.9'} # take care to keep this variable consistent with the version used in pkg_macos_purepy_release_extra_pyver
+  extends: .test_unix_purepy_pkg
+  needs:
+    - job: pkg_macos_purepy_release_extra_pyver
+      artifacts: true
+  tags:
+    - macos
+    - macos_pkg_tester
+
 test_nux_purepy_release:
   variables: {JOB_PYTHON: 'python3'}
   extends: .test_unix_purepy_pkg
@@ -568,6 +586,7 @@ pypi_pub:
     - job: test_nux_purepy_release
     - job: test_win_purepy_pkg
     - job: test_macos_purepy_release
+    - job: test_macos_purepy_release_extra_pyver
   only:
     - tags
   tags: