Move to py3.12 (py3.11 maintained, py3.10 dropped).

e1b84251 · hhakim · 7a6a76f9 · e1b84251
Commit e1b84251 authored 1 year ago by hhakim
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,10 +5,10 @@ variables:
    # DURL: "https://gitlab.inria.fr/faustgrp/gforge_files/-/raw/master/"
    DURL: "https://faustgrp.gitlabpages.inria.fr/faust/last-doc/html/"
    DFILE: "faust_data.zip"
-    JOB_PYTHON: "python3.10" # if set again in job, it hides this one (precedence: https://docs.gitlab.com/13.6/ee/ci/variables/#priority-of-environment-variables)
-    WIN_PY_VER: '3.11' # default python version used to build python wrapper on windows (for both whl package and nsis .exe)
-    NUX_PY_VER: '3.11' # default python version used for linux system packages (.rpm and .deb)
-    MACOS_PY_VER: '3.11' # default python version used for macOS system packages (.pkg)
+    JOB_PYTHON: "python3.11" # if set again in job, it hides this one (precedence: https://docs.gitlab.com/13.6/ee/ci/variables/#priority-of-environment-variables)
+    WIN_PY_VER: '3.12' # default python version used to build python wrapper on windows (for both whl package and nsis .exe)
+    NUX_PY_VER: '3.12' # default python version used for linux system packages (.rpm and .deb)
+    MACOS_PY_VER: '3.12' # default python version used for macOS system packages (.pkg)
    GEN_EGG: 'OFF'
    USE_OPENBLASO: 'OFF' # by default any pip whl pkg doesn't use openblas-openmp (eigen blas backend)
    PYFAUST_PKG_NAME: 'pyfaust' # default package name, it can change for openblas-openmp whl package # only used in test_unix_purepy_pkg job
@@ -21,7 +21,7 @@ variables:
    MACOS_ZLIB_SLIB_PATH: '/opt/local/lib/libz.a'
    MACOS_MATIO_SLIB_PATH: '/usr/local/lib/libmatio.a'
    MACOS_SZIP_SLIB_PATH: '/opt/local/lib/libsz.a'
-    WHEEL_PY_VERSIONS: '3.10;3.11' # used in setup.py (via cmake) for python language classifiers
+    WHEEL_PY_VERSIONS: '3.11;3.12' # used in setup.py (via cmake) for python language classifiers

 .ctest_template: &ctest_script
    script:
@@ -590,7 +590,7 @@ pkg_macos_purepy_rev:

 pkg_linux_purepy_rev:
    extends: .pkg_purepy_rev
-    variables: {GIT_SUBMODULE_STRATEGY: recursive, MATIO_STATIC_LIB_PATH: $LINUX_MATIO_SLIB_PATH, Z_STATIC_LIB_PATH: $LINUX_ZLIB_SLIB_PATH, HDF5_STATIC_LIB_PATH: $LINUX_HDF5_SLIB_PATH, BUILD_MULTITHREAD: "ON", NOPY2: "ON", USE_GPU_MOD: "ON", CMAKE_PREFIX_PATH: "../gpu_mod", EXPERIMENTAL_PKG: "ON", CMAKE_CXX_COMPILER: "clang++", PYTHON_PATH: '/usr/local/bin/python3.11', JOB_PYTHON: 'python3.11'} # py version should be the same as NUX_PY_VER (unfortunately can't concat as 'python'$NUX_PY_VER with var expansion)
+    variables: {GIT_SUBMODULE_STRATEGY: recursive, MATIO_STATIC_LIB_PATH: $LINUX_MATIO_SLIB_PATH, Z_STATIC_LIB_PATH: $LINUX_ZLIB_SLIB_PATH, HDF5_STATIC_LIB_PATH: $LINUX_HDF5_SLIB_PATH, BUILD_MULTITHREAD: "ON", NOPY2: "ON", USE_GPU_MOD: "ON", CMAKE_PREFIX_PATH: "../gpu_mod", EXPERIMENTAL_PKG: "ON", CMAKE_CXX_COMPILER: "clang++", PYTHON_PATH: '/usr/local/bin/python3.12', JOB_PYTHON: 'python3.12'} # py version should be the same as NUX_PY_VER (unfortunately can't concat as 'python'$NUX_PY_VER with var expansion)
    tags:
        - linux
        - tux_packager
@@ -622,7 +622,7 @@ pkg_linux_purepy_rev:

 pkg_macos_purepy_release:
    extends: .pkg_purepy_release
-    variables: {MATIO_STATIC_LIB_PATH: $MACOS_MATIO_SLIB_PATH, Z_STATIC_LIB_PATH: $MACOS_ZLIB_SLIB_PATH, HDF5_STATIC_LIB_PATH: $MACOS_HDF5_SLIB_PATH, SZIP_STATIC_LIB_PATH: $MACOS_SZIP_SLIB_PATH, BUILD_MULTITHREAD: "ON", FAUST_TORCH: "OFF", EXPERIMENTAL_PKG: "OFF", NOPY2: "ON", CMAKE_CXX_COMPILER: "/opt/local/bin/clang++-mp-9.0", PYTHON_PATH: '/opt/local/bin/python3.10', JOB_PYTHON: 'python3.10'}
+    variables: {MATIO_STATIC_LIB_PATH: $MACOS_MATIO_SLIB_PATH, Z_STATIC_LIB_PATH: $MACOS_ZLIB_SLIB_PATH, HDF5_STATIC_LIB_PATH: $MACOS_HDF5_SLIB_PATH, SZIP_STATIC_LIB_PATH: $MACOS_SZIP_SLIB_PATH, BUILD_MULTITHREAD: "ON", FAUST_TORCH: "OFF", EXPERIMENTAL_PKG: "OFF", NOPY2: "ON", CMAKE_CXX_COMPILER: "/opt/local/bin/clang++-mp-9.0", PYTHON_PATH: '/usr/local/bin/python3.11', JOB_PYTHON: 'python3.11'}
    before_script:
      - VERSION=$CI_COMMIT_TAG
      - if [[ ! -d 'build' ]]; then  mkdir build;fi; cd build
@@ -633,7 +633,7 @@ pkg_macos_purepy_release:

 pkg_macos_purepy_release_extra_pyver:
    extends: pkg_macos_purepy_release
-    variables: {MATIO_STATIC_LIB_PATH: $MACOS_MATIO_SLIB_PATH, Z_STATIC_LIB_PATH: $MACOS_ZLIB_SLIB_PATH, HDF5_STATIC_LIB_PATH: $MACOS_HDF5_SLIB_PATH, SZIP_STATIC_LIB_PATH: $MACOS_SZIP_SLIB_PATH, BUILD_MULTITHREAD: "ON", FAUST_TORCH: "OFF", EXPERIMENTAL_PKG: "OFF", NOPY2: "ON", PYTHON_PATH: '/opt/local/bin/python3.11', JOB_PYTHON: 'python3.11', CMAKE_CXX_COMPILER: "/opt/local/bin/clang++-mp-9.0"}
+    variables: {MATIO_STATIC_LIB_PATH: $MACOS_MATIO_SLIB_PATH, Z_STATIC_LIB_PATH: $MACOS_ZLIB_SLIB_PATH, HDF5_STATIC_LIB_PATH: $MACOS_HDF5_SLIB_PATH, SZIP_STATIC_LIB_PATH: $MACOS_SZIP_SLIB_PATH, BUILD_MULTITHREAD: "ON", FAUST_TORCH: "OFF", EXPERIMENTAL_PKG: "OFF", NOPY2: "ON", PYTHON_PATH: '/usr/local/bin/python3.12', JOB_PYTHON: 'python3.12', CMAKE_CXX_COMPILER: "/opt/local/bin/clang++-mp-9.0"}
    tags:
        - macos

@@ -648,7 +648,7 @@ pkg_macos_purepy_release_torch_linked:

 pkg_linux_purepy_release:
    extends: .pkg_purepy_release
-    variables: {GIT_SUBMODULE_STRATEGY: recursive, MATIO_STATIC_LIB_PATH: $LINUX_MATIO_SLIB_PATH, Z_STATIC_LIB_PATH: $LINUX_ZLIB_SLIB_PATH, HDF5_STATIC_LIB_PATH: $LINUX_HDF5_SLIB_PATH, BUILD_MULTITHREAD: "ON", NOPY2: "ON", USE_GPU_MOD: "ON", CMAKE_PREFIX_PATH: "../gpu_mod", FAUST_TORCH: "OFF", EXPERIMENTAL_PKG: "OFF", CMAKE_CXX_COMPILER: "clang++", PYTHON_PATH: '/usr/local/bin/python3.10', JOB_PYTHON: 'python3.10'}
+    variables: {GIT_SUBMODULE_STRATEGY: recursive, MATIO_STATIC_LIB_PATH: $LINUX_MATIO_SLIB_PATH, Z_STATIC_LIB_PATH: $LINUX_ZLIB_SLIB_PATH, HDF5_STATIC_LIB_PATH: $LINUX_HDF5_SLIB_PATH, BUILD_MULTITHREAD: "ON", NOPY2: "ON", USE_GPU_MOD: "ON", CMAKE_PREFIX_PATH: "../gpu_mod", FAUST_TORCH: "OFF", EXPERIMENTAL_PKG: "OFF", CMAKE_CXX_COMPILER: "clang++", PYTHON_PATH: '/usr/local/bin/python3.11', JOB_PYTHON: 'python3.11'}
    after_script:
        # verify the pyfaust root with doctest (no go on failure)
        - if [[ ! $(basename $PWD) = 'build' ]]; then  cd build;fi
@@ -661,7 +661,7 @@ pkg_linux_purepy_release:

 pkg_linux_purepy_release_extra_pyver:
    extends: .pkg_purepy_release
-    variables: {GIT_SUBMODULE_STRATEGY: recursive, MATIO_STATIC_LIB_PATH: $LINUX_MATIO_SLIB_PATH, Z_STATIC_LIB_PATH: $LINUX_ZLIB_SLIB_PATH, HDF5_STATIC_LIB_PATH: $LINUX_HDF5_SLIB_PATH, BUILD_MULTITHREAD: "ON", NOPY2: "ON", USE_GPU_MOD: "ON", CMAKE_PREFIX_PATH: "../gpu_mod", FAUST_TORCH: "OFF", EXPERIMENTAL_PKG: "OFF", PYTHON_PATH: '/usr/local/bin/python3.11', JOB_PYTHON: 'python3.11', CMAKE_CXX_COMPILER: "clang++"}
+    variables: {GIT_SUBMODULE_STRATEGY: recursive, MATIO_STATIC_LIB_PATH: $LINUX_MATIO_SLIB_PATH, Z_STATIC_LIB_PATH: $LINUX_ZLIB_SLIB_PATH, HDF5_STATIC_LIB_PATH: $LINUX_HDF5_SLIB_PATH, BUILD_MULTITHREAD: "ON", NOPY2: "ON", USE_GPU_MOD: "ON", CMAKE_PREFIX_PATH: "../gpu_mod", FAUST_TORCH: "OFF", EXPERIMENTAL_PKG: "OFF", PYTHON_PATH: '/usr/local/bin/python3.12', JOB_PYTHON: 'python3.12', CMAKE_CXX_COMPILER: "clang++"}
    tags:
        - linux
        - tux_packager
@@ -675,7 +675,7 @@ pkg_linux_purepy_release_extra_pyver:

 pkg_linux_purepy_release_openblaso:
    extends: .pkg_purepy_release
-    variables: {GIT_SUBMODULE_STRATEGY: recursive, MATIO_STATIC_LIB_PATH: $LINUX_MATIO_SLIB_PATH, Z_STATIC_LIB_PATH: $LINUX_ZLIB_SLIB_PATH, HDF5_STATIC_LIB_PATH: $LINUX_HDF5_SLIB_PATH, BUILD_MULTITHREAD: "ON", NOPY2: "ON", USE_GPU_MOD: "ON", CMAKE_PREFIX_PATH: "../gpu_mod", FAUST_TORCH: "OFF", EXPERIMENTAL_PKG: "OFF", CMAKE_CXX_COMPILER: "clang++", USE_OPENBLASO: "ON", PYTHON_PATH: '/usr/local/bin/python3.10', JOB_PYTHON: 'python3.10'}
+    variables: {GIT_SUBMODULE_STRATEGY: recursive, MATIO_STATIC_LIB_PATH: $LINUX_MATIO_SLIB_PATH, Z_STATIC_LIB_PATH: $LINUX_ZLIB_SLIB_PATH, HDF5_STATIC_LIB_PATH: $LINUX_HDF5_SLIB_PATH, BUILD_MULTITHREAD: "ON", NOPY2: "ON", USE_GPU_MOD: "ON", CMAKE_PREFIX_PATH: "../gpu_mod", FAUST_TORCH: "OFF", EXPERIMENTAL_PKG: "OFF", CMAKE_CXX_COMPILER: "clang++", USE_OPENBLASO: "ON", PYTHON_PATH: '/usr/local/bin/python3.11', JOB_PYTHON: 'python3.11'}
    tags:
        - linux
        - tux_packager
@@ -747,7 +747,7 @@ pkg_win_purepy_rev:

 pkg_win_purepy_release:
    extends: .pkg_win_purepy
-    variables: {BUILD_CONFIG: "Release", GIT_SUBMODULE_STRATEGY: recursive, EXPERIMENTAL_PKG: "OFF", WIN_PY_VER: '3.10'}
+    variables: {BUILD_CONFIG: "Release", GIT_SUBMODULE_STRATEGY: recursive, EXPERIMENTAL_PKG: "OFF", WIN_PY_VER: '3.11'}
    before_script:
        - 'set VERSION=%CI_COMMIT_TAG%'
    artifacts:
@@ -757,7 +757,7 @@ pkg_win_purepy_release:

 pkg_win_purepy_release_extra_pyver:
    extends: .pkg_win_purepy
-    variables: {BUILD_CONFIG: "Release", GIT_SUBMODULE_STRATEGY: recursive, EXPERIMENTAL_PKG: "OFF", WIN_PY_VER: '3.11'}
+    variables: {BUILD_CONFIG: "Release", GIT_SUBMODULE_STRATEGY: recursive, EXPERIMENTAL_PKG: "OFF", WIN_PY_VER: '3.12'}
    before_script:
        - 'set VERSION=%CI_COMMIT_TAG%'
    artifacts:
@@ -868,7 +868,7 @@ test_linux_pkg_release:
    - PYVER=$($JOB_PYTHON --version | awk '{print $2}' | sed -e 's/\.//;s/\(.*\)\..*/\1/')
    - $JOB_PYTHON -m pip install --upgrade pip
    - SYS=$(if uname -a | grep -q Darwin; then echo macosx; else echo linux; fi)
-      # avoid to build from sources scipy==1.10 and matplolib==3.6.3, either with py3.10 or 3.11
+      # avoid to build from sources scipy==1.10 and matplolib==3.6.3, either with py3.11 or 3.12
    - if [ "$SYS" = macosx -a "$PYVER" = "39" ]; then pip install scipy==1.9 matplotlib==3.5.3; fi
    - if [ "$SYS" = macosx -a "$PYVER" = "311" ]; then wget https://files.pythonhosted.org/packages/7a/23/13579b64ab458782a43e11e1ad095488458b8df099063ae07773666adada/scipy-1.10.0-cp311-cp311-macosx_10_15_x86_64.whl; mv scipy-1.10.0-cp311-cp311-macosx_10_15_x86_64.whl scipy-1.10.0-cp311-cp311-macosx_10_9_x86_64.whl; pip install scipy-1.10.0-cp311-cp311-macosx_10_9_x86_64.whl; fi
    - if [ "$SYS" = macosx -a "$JOB_PYTHON" = "python3.11" ]; then wget https://files.pythonhosted.org/packages/09/ac/f3c841a09bb7479832832472ef9ec49c2069f437d0266c1168d586eee601/matplotlib-3.6.3-cp311-cp311-macosx_10_12_x86_64.whl;mv matplotlib-3.6.3-cp311-cp311-macosx_10_12_x86_64.whl matplotlib-3.6.3-cp311-cp311-macosx_10_9_x86_64.whl;pip install matplotlib-3.6.3-cp311-cp311-macosx_10_9_x86_64.whl; fi
@@ -885,7 +885,7 @@ test_linux_pkg_release:
    - tags

 test_macos_purepy_release: # take care to keep this variable consistent with the version used in pkg_macos_purepy_release
-  variables: {JOB_PYTHON: 'python3.10'}
+  variables: {JOB_PYTHON: 'python3.11'}
  extends: .test_unix_purepy_pkg
  needs:
    - job: pkg_macos_purepy_release
@@ -894,7 +894,7 @@ test_macos_purepy_release: # take care to keep this variable consistent with the
    - macos_pip_pkg_tester

 test_macos_purepy_release_extra_pyver:
-  variables: {JOB_PYTHON: 'python3.11'} # take care to keep this variable consistent with the version used in pkg_macos_purepy_release_extra_pyver
+  variables: {JOB_PYTHON: 'python3.12'} # 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
@@ -903,7 +903,7 @@ test_macos_purepy_release_extra_pyver:
    - macos_pip_pkg_tester

 test_nux_purepy_release:
-  variables: {JOB_PYTHON: 'python3.10'}
+  variables: {JOB_PYTHON: 'python3.11'}
  extends: .test_unix_purepy_pkg
  needs:
    - job: pkg_linux_purepy_release
@@ -912,7 +912,7 @@ test_nux_purepy_release:
    - linux

 test_nux_purepy_release_extra_pyver:
-  variables: {JOB_PYTHON: 'python3.11'}
+  variables: {JOB_PYTHON: 'python3.12'}
  extends: .test_unix_purepy_pkg
  needs:
    - job: pkg_linux_purepy_release_extra_pyver
@@ -921,7 +921,7 @@ test_nux_purepy_release_extra_pyver:
    - linux

 test_nux_openblaso_purepy_release:
-  variables: {JOB_PYTHON: 'python3.10', PYFAUST_PKG_NAME: 'pyfaust_openblaso'}
+  variables: {JOB_PYTHON: 'python3.11', PYFAUST_PKG_NAME: 'pyfaust_openblaso'}
  extends: .test_unix_purepy_pkg
  needs:
    - job: pkg_linux_purepy_release_openblaso
@@ -930,7 +930,7 @@ test_nux_openblaso_purepy_release:
    - linux

 test_win_purepy_pkg:
-  variables: {JOB_PYTHON: 'py', WIN_PY_VER: '3.10'}
+  variables: {JOB_PYTHON: 'py', WIN_PY_VER: '3.11'}
  stage: pkg_test
  script:
    # TODO: externalize in a script
@@ -959,7 +959,7 @@ test_win_purepy_pkg:

 test_win_purepy_pkg_extra_pyver:
  extends: test_win_purepy_pkg
-  variables: {JOB_PYTHON: 'py', WIN_PY_VER: '3.11'}
+  variables: {JOB_PYTHON: 'py', WIN_PY_VER: '3.12'}
  needs:
    - job: pkg_win_purepy_release_extra_pyver
      artifacts: true
@@ -1027,9 +1027,9 @@ pypi_pub:
 conda_linux_pub:
  stage: conda_pkgs
  script:
-    - misc/continuous_integration/conda_pkg/conda_build_upload_pyfaust.sh linux 3.10 misc/continuous_integration/conda_pkg/meta.yaml.in
-    - conda env remove -n build_upload_pyfaust_venv_39
    - misc/continuous_integration/conda_pkg/conda_build_upload_pyfaust.sh linux 3.11 misc/continuous_integration/conda_pkg/meta.yaml.in
+    - conda env remove -n build_upload_pyfaust_venv_39
+    - misc/continuous_integration/conda_pkg/conda_build_upload_pyfaust.sh linux 3.12 misc/continuous_integration/conda_pkg/meta.yaml.in
    - conda env remove -n build_upload_pyfaust_venv_311
  only:
    - tags
@@ -1042,8 +1042,8 @@ conda_linux_pub:
 .conda_win_pub:
  stage: conda_pkgs
  script:
-    - start /wait git-bash -c "misc/continuous_integration/conda_pkg/conda_build_upload_pyfaust.sh win 3.10 misc/continuous_integration/conda_pkg/meta.yaml.in"
    - start /wait git-bash -c "misc/continuous_integration/conda_pkg/conda_build_upload_pyfaust.sh win 3.11 misc/continuous_integration/conda_pkg/meta.yaml.in"
+    - start /wait git-bash -c "misc/continuous_integration/conda_pkg/conda_build_upload_pyfaust.sh win 3.12 misc/continuous_integration/conda_pkg/meta.yaml.in"
  only:
    - tags
  tags:
@@ -1055,9 +1055,9 @@ conda_linux_pub:
 conda_macosx_pub:
  stage: conda_pkgs
  script:
-    - misc/continuous_integration/conda_pkg/conda_build_upload_pyfaust.sh macosx 3.10 misc/continuous_integration/conda_pkg/meta.yaml.in
-    - conda env remove -n build_upload_pyfaust_venv_39
    - misc/continuous_integration/conda_pkg/conda_build_upload_pyfaust.sh macosx 3.11 misc/continuous_integration/conda_pkg/meta.yaml.in
+    - conda env remove -n build_upload_pyfaust_venv_39
+    - misc/continuous_integration/conda_pkg/conda_build_upload_pyfaust.sh macosx 3.12 misc/continuous_integration/conda_pkg/meta.yaml.in
    - conda env remove -n build_upload_pyfaust_venv_311
  only:
    - tags