Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 195fe71d authored by hhakim's avatar hhakim
Browse files

Replace py3.9 by py3.10 in package generations.

parent 004b23f8
Branches
No related tags found
No related merge requests found
Pipeline #836373 passed
Stage: test
Stage: pkg_purepy
Stage: pkg
Stage: code_cov
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 16
− 16
View file @ 195fe71d
...@@ -5,7 +5,7 @@ variables: ...@@ -5,7 +5,7 @@ variables:
# DURL: "https://gitlab.inria.fr/faustgrp/gforge_files/-/raw/master/" # DURL: "https://gitlab.inria.fr/faustgrp/gforge_files/-/raw/master/"
DURL: "https://faustgrp.gitlabpages.inria.fr/faust/last-doc/html/" DURL: "https://faustgrp.gitlabpages.inria.fr/faust/last-doc/html/"
DFILE: "faust_data.zip" DFILE: "faust_data.zip"
JOB_PYTHON: "python3.9" # if set again in job, it hides this one (precedence: https://docs.gitlab.com/13.6/ee/ci/variables/#priority-of-environment-variables) 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) 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) 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) MACOS_PY_VER: '3.11' # default python version used for macOS system packages (.pkg)
...@@ -229,9 +229,9 @@ pyfaust_test_code_coverage: ...@@ -229,9 +229,9 @@ pyfaust_test_code_coverage:
# use conda rather than venv because python built on VM has not been # use conda rather than venv because python built on VM has not been
# built with --enable-loadable-sqlite-extensions (and sqlite-devel) # built with --enable-loadable-sqlite-extensions (and sqlite-devel)
# but it is a need of coverave python package # but it is a need of coverave python package
# so we use py3.9 from conda # so we use py3.10 from conda
- cmake -P misc/download_unzip_faust_misc_data.cmake # tests need data - cmake -P misc/download_unzip_faust_misc_data.cmake # tests need data
- conda create -n test_coverage_pyfaust python==3.9 - conda create -n test_coverage_pyfaust python==3.10
- conda activate test_coverage_pyfaust - conda activate test_coverage_pyfaust
# install pyfaust with pip # install pyfaust with pip
- pip install $(find ./ -name "*pyfaust*whl") - pip install $(find ./ -name "*pyfaust*whl")
...@@ -556,7 +556,7 @@ pkg_macos_purepy_rev: ...@@ -556,7 +556,7 @@ pkg_macos_purepy_rev:
pkg_linux_purepy_rev: pkg_linux_purepy_rev:
extends: .pkg_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.9', JOB_PYTHON: 'python3.9'} 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.10', JOB_PYTHON: 'python3.10'}
tags: tags:
- linux - linux
- tux_packager - tux_packager
...@@ -588,7 +588,7 @@ pkg_linux_purepy_rev: ...@@ -588,7 +588,7 @@ pkg_linux_purepy_rev:
pkg_macos_purepy_release: pkg_macos_purepy_release:
extends: .pkg_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.9', JOB_PYTHON: 'python3.9'} 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'}
before_script: before_script:
- VERSION=$CI_COMMIT_TAG - VERSION=$CI_COMMIT_TAG
- if [[ ! -d 'build' ]]; then mkdir build;fi; cd build - if [[ ! -d 'build' ]]; then mkdir build;fi; cd build
...@@ -614,7 +614,7 @@ pkg_macos_purepy_release_torch_linked: ...@@ -614,7 +614,7 @@ pkg_macos_purepy_release_torch_linked:
pkg_linux_purepy_release: pkg_linux_purepy_release:
extends: .pkg_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.9', JOB_PYTHON: 'python3.9'} 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'}
after_script: after_script:
# verify the pyfaust root with doctest (no go on failure) # verify the pyfaust root with doctest (no go on failure)
- if [[ ! $(basename $PWD) = 'build' ]]; then cd build;fi - if [[ ! $(basename $PWD) = 'build' ]]; then cd build;fi
...@@ -641,7 +641,7 @@ pkg_linux_purepy_release_extra_pyver: ...@@ -641,7 +641,7 @@ pkg_linux_purepy_release_extra_pyver:
pkg_linux_purepy_release_openblaso: pkg_linux_purepy_release_openblaso:
extends: .pkg_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++", USE_OPENBLASO: "ON", PYTHON_PATH: '/usr/local/bin/python3.9', JOB_PYTHON: 'python3.9'} 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'}
tags: tags:
- linux - linux
- tux_packager - tux_packager
...@@ -710,7 +710,7 @@ pkg_win_purepy_rev: ...@@ -710,7 +710,7 @@ pkg_win_purepy_rev:
pkg_win_purepy_release: pkg_win_purepy_release:
extends: .pkg_win_purepy extends: .pkg_win_purepy
variables: {BUILD_CONFIG: "Release", GIT_SUBMODULE_STRATEGY: recursive, EXPERIMENTAL_PKG: "OFF", WIN_PY_VER: '3.9'} variables: {BUILD_CONFIG: "Release", GIT_SUBMODULE_STRATEGY: recursive, EXPERIMENTAL_PKG: "OFF", WIN_PY_VER: '3.10'}
before_script: before_script:
- 'set VERSION=%CI_COMMIT_TAG%' - 'set VERSION=%CI_COMMIT_TAG%'
artifacts: artifacts:
...@@ -810,7 +810,7 @@ test_linux_pkg_release: ...@@ -810,7 +810,7 @@ test_linux_pkg_release:
- PYVER=$($JOB_PYTHON --version | awk '{print $2}' | sed -e 's/\.//;s/\(.*\)\..*/\1/') - PYVER=$($JOB_PYTHON --version | awk '{print $2}' | sed -e 's/\.//;s/\(.*\)\..*/\1/')
- $JOB_PYTHON -m pip install --upgrade pip - $JOB_PYTHON -m pip install --upgrade pip
- SYS=$(if uname -a | grep -q Darwin; then echo macosx; else echo linux; fi) - 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.9 or 3.11 # avoid to build from sources scipy==1.10 and matplolib==3.6.3, either with py3.10 or 3.11
- if [ "$SYS" = macosx -a "$PYVER" = "39" ]; then pip install scipy==1.9 matplotlib==3.5.3; fi - 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 "$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 - 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
...@@ -823,7 +823,7 @@ test_linux_pkg_release: ...@@ -823,7 +823,7 @@ test_linux_pkg_release:
- tags - tags
test_macos_purepy_release: # take care to keep this variable consistent with the version used in pkg_macos_purepy_release test_macos_purepy_release: # take care to keep this variable consistent with the version used in pkg_macos_purepy_release
variables: {JOB_PYTHON: 'python3.9'} variables: {JOB_PYTHON: 'python3.10'}
extends: .test_unix_purepy_pkg extends: .test_unix_purepy_pkg
needs: needs:
- job: pkg_macos_purepy_release - job: pkg_macos_purepy_release
...@@ -841,7 +841,7 @@ test_macos_purepy_release_extra_pyver: ...@@ -841,7 +841,7 @@ test_macos_purepy_release_extra_pyver:
- macos_pip_pkg_tester - macos_pip_pkg_tester
test_nux_purepy_release: test_nux_purepy_release:
variables: {JOB_PYTHON: 'python3.9'} variables: {JOB_PYTHON: 'python3.10'}
extends: .test_unix_purepy_pkg extends: .test_unix_purepy_pkg
needs: needs:
- job: pkg_linux_purepy_release - job: pkg_linux_purepy_release
...@@ -859,7 +859,7 @@ test_nux_purepy_release_extra_pyver: ...@@ -859,7 +859,7 @@ test_nux_purepy_release_extra_pyver:
- linux - linux
test_nux_openblaso_purepy_release: test_nux_openblaso_purepy_release:
variables: {JOB_PYTHON: 'python3.9', PYFAUST_PKG_NAME: 'pyfaust_openblaso'} variables: {JOB_PYTHON: 'python3.10', PYFAUST_PKG_NAME: 'pyfaust_openblaso'}
extends: .test_unix_purepy_pkg extends: .test_unix_purepy_pkg
needs: needs:
- job: pkg_linux_purepy_release_openblaso - job: pkg_linux_purepy_release_openblaso
...@@ -868,7 +868,7 @@ test_nux_openblaso_purepy_release: ...@@ -868,7 +868,7 @@ test_nux_openblaso_purepy_release:
- linux - linux
test_win_purepy_pkg: test_win_purepy_pkg:
variables: {JOB_PYTHON: 'py', WIN_PY_VER: '3.9'} variables: {JOB_PYTHON: 'py', WIN_PY_VER: '3.10'}
stage: pkg_test stage: pkg_test
script: script:
- 'cd build\wrapper\python\dist' - 'cd build\wrapper\python\dist'
...@@ -959,7 +959,7 @@ pypi_pub: ...@@ -959,7 +959,7 @@ pypi_pub:
conda_linux_pub: conda_linux_pub:
stage: conda_pkgs stage: conda_pkgs
script: script:
- misc/continuous_integration/conda_pkg/conda_build_upload_pyfaust.sh linux 3.9 misc/continuous_integration/conda_pkg/meta.yaml.in - 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 - 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 - 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_311 - conda env remove -n build_upload_pyfaust_venv_311
...@@ -974,7 +974,7 @@ conda_linux_pub: ...@@ -974,7 +974,7 @@ conda_linux_pub:
.conda_win_pub: .conda_win_pub:
stage: conda_pkgs stage: conda_pkgs
script: script:
- start /wait git-bash -c "misc/continuous_integration/conda_pkg/conda_build_upload_pyfaust.sh win 3.9 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.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.11 misc/continuous_integration/conda_pkg/meta.yaml.in"
only: only:
- tags - tags
...@@ -987,7 +987,7 @@ conda_linux_pub: ...@@ -987,7 +987,7 @@ conda_linux_pub:
conda_macosx_pub: conda_macosx_pub:
stage: conda_pkgs stage: conda_pkgs
script: script:
- misc/continuous_integration/conda_pkg/conda_build_upload_pyfaust.sh macosx 3.9 misc/continuous_integration/conda_pkg/meta.yaml.in - 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 - 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 - 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_311 - conda env remove -n build_upload_pyfaust_venv_311
......
misc/continuous_integration/ci.inria.fr/macosx/setup_macosx_for_faust.sh
+ 9
− 9
View file @ 195fe71d
...@@ -48,19 +48,19 @@ ln -sf /opt/local/bin/clang++-mp-9.0 /usr/bin/clang++ ...@@ -48,19 +48,19 @@ ln -sf /opt/local/bin/clang++-mp-9.0 /usr/bin/clang++
# ciosx:~ ci$ /opt/local/libexec/llvm-8.0/bin/clang --version # ciosx:~ ci$ /opt/local/libexec/llvm-8.0/bin/clang --version
# dyld: cannot load 'clang' (load command 0x80000034 is unknown) # dyld: cannot load 'clang' (load command 0x80000034 is unknown)
# Trace/BPT trap: 5 # Trace/BPT trap: 5
#mv /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++_ # don't do this or port won't be able to detect clang version and make any install #mv /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++ backup
#udo ln -sf /opt/local/bin/clang++-mp-9.0 /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++ #udo ln -sf /opt/local/bin/clang++-mp-9.0 /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++
### 5. Install Python packages and dependencies ### 5. Install Python packages and dependencies
yes | port install graphviz doxygen yes | port install graphviz doxygen
sudo ln -sf /opt/local/bin/dot /usr/bin/ sudo ln -sf /opt/local/bin/dot /usr/bin/
yes | port install python39 py39-pip yes | port install python310 py310-pip
yes | port install jpeg # pillow (indirect denpendency of pyfaust needs this to build) yes | port install jpeg # pillow (indirect dependency of pyfaust needs this to build)
port select --set python python39 port select --set python python310
port select --set pip pip39 port select --set pip pip310
ln -sf /opt/local/bin/python3.9 /opt/local/bin/python3 ln -sf /opt/local/bin/python3.10 /opt/local/bin/python3
yes | port install py39-cython yes | port install py310-cython
yes | port select --set cython cython39 yes | port select --set cython cython310
yes | python3.9 -m pip install doxypypy chardet wheel pygsp numpy setuptools==49.1.3 # above this version commit sha256 as version fails yes | python3.10 -m pip install doxypypy chardet wheel pygsp numpy setuptools==49.1.3 # above this version commit sha256 as version fails
# get dest dir before downloading because otherwise it would be the current path # get dest dir before downloading because otherwise it would be the current path
DOXYPYPY_DIR=$(dirname $(python3 -c "import doxypypy; print(doxypypy.__file__)")) DOXYPYPY_DIR=$(dirname $(python3 -c "import doxypypy; print(doxypypy.__file__)"))
wget https://raw.githubusercontent.com/Feneric/doxypypy/master/doxypypy/doxypypy.py wget https://raw.githubusercontent.com/Feneric/doxypypy/master/doxypypy/doxypypy.py
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment