Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build with 2024.10.01 images and test 3.13 for pip linux #1142

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Build with 2024.10.01 images and test 3.13 for pip linux #1142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7755e6d
Build with 2024.10.01 images and test 3.13 for pip linux
VincentRouvreau Oct 9, 2024
d23a105
requires docker to be updated with python 3.13 and its requirements
VincentRouvreau Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
examples:
docker:
# cf. https://github.com/GUDHI/gudhi-deploy/blob/main/Dockerfile_for_circleci_image
- image: gudhi/ci_for_gudhi:2024.09.01
- image: gudhi/ci_for_gudhi:2024.10.01
steps:
- checkout
- run:
Expand All @@ -24,7 +24,7 @@ jobs:

tests:
docker:
- image: gudhi/ci_for_gudhi:2024.09.01
- image: gudhi/ci_for_gudhi:2024.10.01
steps:
- checkout
- run:
Expand All @@ -43,7 +43,7 @@ jobs:

debug_tests:
docker:
- image: gudhi/ci_for_gudhi:2024.09.01
- image: gudhi/ci_for_gudhi:2024.10.01
steps:
- checkout
- run:
Expand All @@ -62,7 +62,7 @@ jobs:

utils:
docker:
- image: gudhi/ci_for_gudhi:2024.09.01
- image: gudhi/ci_for_gudhi:2024.10.01
steps:
- checkout
- run:
Expand All @@ -81,7 +81,7 @@ jobs:

python:
docker:
- image: gudhi/ci_for_gudhi:2024.09.01
- image: gudhi/ci_for_gudhi:2024.10.01
resource_class: large # Delaunay complex requires about 5 Gb of RAM to compile
steps:
- checkout
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:

doxygen:
docker:
- image: gudhi/doxygen_for_gudhi:2024.06.01
- image: gudhi/doxygen_for_gudhi:2024.10.01
steps:
- checkout
- run:
Expand Down Expand Up @@ -147,7 +147,7 @@ jobs:

bibliography:
docker:
- image: gudhi/doxygen_for_gudhi:2024.06.01
- image: gudhi/doxygen_for_gudhi:2024.10.01
steps:
- checkout
- run:
Expand All @@ -170,7 +170,7 @@ jobs:
examples_without_cgal_eigen:
docker:
# cf. https://github.com/GUDHI/gudhi-deploy/blob/main/Dockerfile_for_circleci_image_without_cgal
- image: gudhi/ci_for_gudhi_wo_cgal:2024.06.01
- image: gudhi/ci_for_gudhi_wo_cgal:2024.10.01
steps:
- checkout
- run:
Expand All @@ -189,7 +189,7 @@ jobs:

tests_without_cgal_eigen:
docker:
- image: gudhi/ci_for_gudhi_wo_cgal:2024.06.01
- image: gudhi/ci_for_gudhi_wo_cgal:2024.10.01
steps:
- checkout
- run:
Expand All @@ -208,7 +208,7 @@ jobs:

utils_without_cgal_eigen:
docker:
- image: gudhi/ci_for_gudhi_wo_cgal:2024.06.01
- image: gudhi/ci_for_gudhi_wo_cgal:2024.10.01
steps:
- checkout
- run:
Expand All @@ -227,7 +227,7 @@ jobs:

python_without_cgal_eigen:
docker:
- image: gudhi/ci_for_gudhi_wo_cgal:2024.06.01
- image: gudhi/ci_for_gudhi_wo_cgal:2024.10.01
steps:
- checkout
- run:
Expand All @@ -249,7 +249,7 @@ jobs:

examples_without_cgal:
docker:
- image: gudhi/ci_for_gudhi_wo_cgal:2024.06.01
- image: gudhi/ci_for_gudhi_wo_cgal:2024.10.01
steps:
- checkout
- run:
Expand All @@ -268,7 +268,7 @@ jobs:

tests_without_cgal:
docker:
- image: gudhi/ci_for_gudhi_wo_cgal:2024.06.01
- image: gudhi/ci_for_gudhi_wo_cgal:2024.10.01
steps:
- checkout
- run:
Expand All @@ -287,7 +287,7 @@ jobs:

utils_without_cgal:
docker:
- image: gudhi/ci_for_gudhi_wo_cgal:2024.06.01
- image: gudhi/ci_for_gudhi_wo_cgal:2024.10.01
steps:
- checkout
- run:
Expand All @@ -306,7 +306,7 @@ jobs:

python_without_cgal:
docker:
- image: gudhi/ci_for_gudhi_wo_cgal:2024.06.01
- image: gudhi/ci_for_gudhi_wo_cgal:2024.10.01
steps:
- checkout
- run:
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/pip-build-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,34 +11,34 @@ jobs:
name: build pip wheel
runs-on: ubuntu-latest
# cf. https://github.com/GUDHI/gudhi-deploy/blob/main/Dockerfile_for_pip
container: gudhi/pip_for_gudhi:2024.06.02
container: gudhi/pip_for_gudhi:2024.10.02
steps:
# Should use actions/checkout@v4, but requires node20, not available for quay.io/pypa/manylinux2014_x86_64
- uses: actions/checkout@v3
with:
submodules: true
- name: Build wheel for Python 3.9
- name: Build wheel for Python 3.13
run: |
mkdir build_39
cd build_39
cmake -DCMAKE_BUILD_TYPE=Release -DPython_EXECUTABLE=$PYTHON39/bin/python ..
mkdir build_313
cd build_313
cmake -DCMAKE_BUILD_TYPE=Release -DPython_EXECUTABLE=$PYTHON313/bin/python ..
cd src/python
$PYTHON39/bin/python -m build -n -w
$PYTHON313/bin/python -m build -n -w
auditwheel repair dist/*.whl
# NumPy 2.X is installed and guarantees ABI compatibility, test it with the minimal numpy version for python version
- name: Install and test wheel for Python 3.9
- name: Install and test wheel for Python 3.13
run: |
$PYTHON39/bin/python -m pip install --user pytest build_39/src/python/dist/*.whl
$PYTHON39/bin/python -m pip install numpy~=1.19.3
$PYTHON39/bin/python -c "import gudhi; print(gudhi.__version__)"
$PYTHON39/bin/python -m pytest -v src/python/test/test_alpha_complex.py
$PYTHON39/bin/python -m pytest -v src/python/test/test_delaunay_complex.py
$PYTHON39/bin/python -m pytest -v src/python/test/test_bottleneck_distance.py
$PYTHON39/bin/python -m pytest -v src/python/test/test_cubical_complex.py
$PYTHON39/bin/python -m pytest -v src/python/test/test_rips_complex.py
$PYTHON313/bin/python -m pip install --user pytest build_313/src/python/dist/*.whl
$PYTHON313/bin/python -m pip install numpy~=2.1.2
$PYTHON313/bin/python -c "import gudhi; print(gudhi.__version__)"
$PYTHON313/bin/python -m pytest -v src/python/test/test_alpha_complex.py
$PYTHON313/bin/python -m pytest -v src/python/test/test_delaunay_complex.py
$PYTHON313/bin/python -m pytest -v src/python/test/test_bottleneck_distance.py
$PYTHON313/bin/python -m pytest -v src/python/test/test_cubical_complex.py
$PYTHON313/bin/python -m pytest -v src/python/test/test_rips_complex.py
- name: Upload linux python wheel
# Should use actions/upload-artifact@v4, but requires node20, not available for quay.io/pypa/manylinux2014_x86_64
uses: actions/upload-artifact@v3
with:
name: linux python wheel
path: build_39/src/python/wheelhouse/*.whl
path: build_313/src/python/wheelhouse/*.whl
21 changes: 20 additions & 1 deletion .github/workflows/pip-packaging-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
name: build pip wheel
runs-on: ubuntu-latest
# cf. https://github.com/GUDHI/gudhi-deploy/blob/main/Dockerfile_for_pip
container: gudhi/pip_for_gudhi:2024.06.02
container: gudhi/pip_for_gudhi:2024.10.02
steps:
# Should use actions/checkout@v4, but requires node20, not available for quay.io/pypa/manylinux2014_x86_64
- uses: actions/checkout@v3
Expand Down Expand Up @@ -111,6 +111,24 @@ jobs:
$PYTHON312/bin/python -m pytest -v src/python/test/test_bottleneck_distance.py
$PYTHON312/bin/python -m pytest -v src/python/test/test_cubical_complex.py
$PYTHON312/bin/python -m pytest -v src/python/test/test_rips_complex.py
- name: Build wheel for Python 3.13
run: |
mkdir build_313
cd build_313
cmake -DCMAKE_BUILD_TYPE=Release -DPython_EXECUTABLE=$PYTHON313/bin/python ..
cd src/python
$PYTHON313/bin/python -m build -n -w
auditwheel repair dist/*.whl
- name: Install and test wheel for Python 3.13
run: |
$PYTHON313/bin/python -m pip install --user pytest build_313/src/python/dist/*.whl
$PYTHON313/bin/python -m pip install numpy~=1.26.0
$PYTHON313/bin/python -c "import gudhi; print(gudhi.__version__)"
$PYTHON313/bin/python -m pytest -v src/python/test/test_alpha_complex.py
$PYTHON313/bin/python -m pytest -v src/python/test/test_delaunay_complex.py
$PYTHON313/bin/python -m pytest -v src/python/test/test_bottleneck_distance.py
$PYTHON313/bin/python -m pytest -v src/python/test/test_cubical_complex.py
$PYTHON313/bin/python -m pytest -v src/python/test/test_rips_complex.py
- name: Publish on PyPi
env:
TWINE_USERNAME: __token__
Expand All @@ -121,3 +139,4 @@ jobs:
$PYTHON38/bin/python -m twine upload build_310/src/python/wheelhouse/*.whl
$PYTHON38/bin/python -m twine upload build_311/src/python/wheelhouse/*.whl
$PYTHON38/bin/python -m twine upload build_312/src/python/wheelhouse/*.whl
$PYTHON38/bin/python -m twine upload build_313/src/python/wheelhouse/*.whl
Loading