From ed7dcbebad7dd6fee114723eb34601b292a2e72c Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Thu, 10 Dec 2020 09:52:17 +0100 Subject: Build python 3.9 pip package and use python 3.9 as default test package --- .github/workflows/pip-build-linux.yml | 10 +++++----- .github/workflows/pip-build-osx.yml | 2 +- .github/workflows/pip-build-windows.yml | 2 +- .github/workflows/pip-packaging-linux.yml | 17 +++++++++++++---- .github/workflows/pip-packaging-osx.yml | 2 +- .github/workflows/pip-packaging-windows.yml | 2 +- 6 files changed, 22 insertions(+), 13 deletions(-) diff --git a/.github/workflows/pip-build-linux.yml b/.github/workflows/pip-build-linux.yml index 14fdc8d2..cf8ddadf 100644 --- a/.github/workflows/pip-build-linux.yml +++ b/.github/workflows/pip-build-linux.yml @@ -11,11 +11,11 @@ jobs: - uses: actions/checkout@v1 with: submodules: true - - name: Build wheels for Python 3.8 + - name: Build wheels for Python 3.9 run: | - mkdir build_38 - cd build_38 - cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON38/bin/python .. + mkdir build_39 + cd build_39 + cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON39/bin/python .. cd src/python - $PYTHON38/bin/python setup.py bdist_wheel + $PYTHON39/bin/python setup.py bdist_wheel auditwheel repair dist/*.whl \ No newline at end of file diff --git a/.github/workflows/pip-build-osx.yml b/.github/workflows/pip-build-osx.yml index 15b8880a..50b8b09c 100644 --- a/.github/workflows/pip-build-osx.yml +++ b/.github/workflows/pip-build-osx.yml @@ -8,7 +8,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: ['3.8'] + python-version: ['3.9'] name: Build wheels for Python ${{ matrix.python-version }} steps: - uses: actions/checkout@v1 diff --git a/.github/workflows/pip-build-windows.yml b/.github/workflows/pip-build-windows.yml index 995d52dd..aacbbc52 100644 --- a/.github/workflows/pip-build-windows.yml +++ b/.github/workflows/pip-build-windows.yml @@ -8,7 +8,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: ['3.8'] + python-version: ['3.9'] name: Build wheels for Python ${{ matrix.python-version }} steps: - uses: actions/checkout@v1 diff --git a/.github/workflows/pip-packaging-linux.yml b/.github/workflows/pip-packaging-linux.yml index bd524af9..469c3b3b 100644 --- a/.github/workflows/pip-packaging-linux.yml +++ b/.github/workflows/pip-packaging-linux.yml @@ -45,12 +45,21 @@ jobs: cd src/python $PYTHON38/bin/python setup.py bdist_wheel auditwheel repair dist/*.whl + - name: Build wheels for Python 3.9 + run: | + mkdir build_39 + cd build_39 + cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON39/bin/python .. + cd src/python + $PYTHON39/bin/python setup.py bdist_wheel + auditwheel repair dist/*.whl - name: Publish on PyPi env: TWINE_USERNAME: __token__ TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | - $PYTHON38/bin/python -m twine upload build_35/src/python/wheelhouse/* - $PYTHON38/bin/python -m twine upload build_36/src/python/wheelhouse/* - $PYTHON38/bin/python -m twine upload build_37/src/python/wheelhouse/* - $PYTHON38/bin/python -m twine upload build_38/src/python/wheelhouse/* \ No newline at end of file + $PYTHON39/bin/python -m twine upload build_35/src/python/wheelhouse/* + $PYTHON39/bin/python -m twine upload build_36/src/python/wheelhouse/* + $PYTHON39/bin/python -m twine upload build_37/src/python/wheelhouse/* + $PYTHON39/bin/python -m twine upload build_38/src/python/wheelhouse/* + $PYTHON39/bin/python -m twine upload build_39/src/python/wheelhouse/* \ No newline at end of file diff --git a/.github/workflows/pip-packaging-osx.yml b/.github/workflows/pip-packaging-osx.yml index c94369ac..46441e65 100644 --- a/.github/workflows/pip-packaging-osx.yml +++ b/.github/workflows/pip-packaging-osx.yml @@ -10,7 +10,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: ['3.5', '3.6', '3.7', '3.8'] + python-version: ['3.5', '3.6', '3.7', '3.8', '3.9'] name: Build wheels for Python ${{ matrix.python-version }} steps: - uses: actions/checkout@v1 diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 8f4ab6e7..3a751486 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -10,7 +10,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: ['3.5', '3.6', '3.7', '3.8'] + python-version: ['3.5', '3.6', '3.7', '3.8', '3.9'] name: Build wheels for Python ${{ matrix.python-version }} steps: - uses: actions/checkout@v1 -- cgit v1.2.3 From 0f8d2bde932f350e25bed760db52ebfafef111fc Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Thu, 10 Dec 2020 11:18:44 +0100 Subject: Need to rebuild gudhi/pip_for_gudhi docker image --- Dockerfile_for_pip | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile_for_pip b/Dockerfile_for_pip index 98668a04..8f9f2443 100644 --- a/Dockerfile_for_pip +++ b/Dockerfile_for_pip @@ -39,12 +39,14 @@ RUN /opt/python/cp35-cp35m/bin/pip install -r build-requirements.txt \ && /opt/python/cp36-cp36m/bin/pip install -r build-requirements.txt\ && /opt/python/cp37-cp37m/bin/pip install -r build-requirements.txt\ && /opt/python/cp38-cp38/bin/pip install -r build-requirements.txt\ - && /opt/python/cp38-cp38/bin/pip install twine + && /opt/python/cp39-cp39/bin/pip install -r build-requirements.txt\ + && /opt/python/cp39-cp39/bin/pip install twine ENV PYTHON35="/opt/python/cp35-cp35m/" ENV PYTHON36="/opt/python/cp36-cp36m/" ENV PYTHON37="/opt/python/cp37-cp37m/" ENV PYTHON38="/opt/python/cp38-cp38/" +ENV PYTHON38="/opt/python/cp39-cp39/" ENV PATH="/opt/cmake/bin:${PATH}" ENV PATH="/opt/rh/devtoolset-8/root/usr/bin:${PATH}" -- cgit v1.2.3 From ec4fe178813119fc4a37c5893e038d2c7b9736f1 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Thu, 10 Dec 2020 13:57:19 +0100 Subject: Typo for python 3.9 --- Dockerfile_for_pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile_for_pip b/Dockerfile_for_pip index 8f9f2443..d5ae6417 100644 --- a/Dockerfile_for_pip +++ b/Dockerfile_for_pip @@ -46,7 +46,7 @@ ENV PYTHON35="/opt/python/cp35-cp35m/" ENV PYTHON36="/opt/python/cp36-cp36m/" ENV PYTHON37="/opt/python/cp37-cp37m/" ENV PYTHON38="/opt/python/cp38-cp38/" -ENV PYTHON38="/opt/python/cp39-cp39/" +ENV PYTHON39="/opt/python/cp39-cp39/" ENV PATH="/opt/cmake/bin:${PATH}" ENV PATH="/opt/rh/devtoolset-8/root/usr/bin:${PATH}" -- cgit v1.2.3