Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
d9e2e6d
use numpy 2.2.5
vot4anto May 13, 2025
8e6b759
switch from v3 to v4 for upload-artifactrs
vot4anto May 13, 2025
5340215
set 3.12 as default python on workflow
vot4anto May 13, 2025
3df97d6
use ubuntu 2404
vot4anto May 13, 2025
74b06b7
add debug on GDAL wheel
vot4anto May 19, 2025
257bf80
add debug on GDAL wheel after download code
vot4anto May 19, 2025
e78a97b
set MB_ML_VER on linux
vot4anto May 19, 2025
5d91b4a
use commit f876f1d for multibuild
vot4anto May 19, 2025
88f04ed
use _2_28 since debian strecth no more available
vot4anto May 19, 2025
f27c37b
change version of packages to meet https://github.com/cgohlke/geospat…
vot4anto May 19, 2025
f0471ef
use curl 8.10.1 due error 43 on curl
vot4anto May 19, 2025
1b7ebfd
nghttp2 1.65.0
vot4anto May 19, 2025
e98525b
use curl 8.9.1
vot4anto May 19, 2025
15e65bf
change curl releases
vot4anto May 19, 2025
1e485b9
revert to 2014
vot4anto May 19, 2025
be3d6f3
use curl 8.12 since no CVE
vot4anto May 19, 2025
bc0fa3e
use curl that compile on ML2014
vot4anto May 19, 2025
ddbebd1
json_c to 0.18 to avoid CMAKE 3.5
vot4anto May 19, 2025
f17db1e
https://github.com/json-c/json-c/pull/888/files
vot4anto May 19, 2025
b48d952
expat 2.6.3
vot4anto May 19, 2025
e1e7aff
use different name for artifacts
vot4anto May 19, 2025
8b2502a
geos 3.11.5
vot4anto May 19, 2025
38c726e
set Fiona to 1.10.1
vot4anto May 19, 2025
dcfbc1d
use ML2014 also on GDAL
vot4anto May 19, 2025
8468b0b
use multibuild as in main
vot4anto May 19, 2025
4d3ec5b
use python from 3.10 to 3.12
vot4anto May 19, 2025
8be0a3d
gdal check for file
vot4anto May 19, 2025
967a63d
add pull_request and use vars for naming artifacts
vot4anto May 20, 2025
9bb1ac5
use vars for naming artifacts
vot4anto May 20, 2025
44af3dc
use debug on test stage
vot4anto May 20, 2025
49e9e37
use numpy 2.2.5 for macos and M1
vot4anto May 20, 2025
92abef9
use artifactv4 on arm
vot4anto May 20, 2025
6100899
change test on linux
vot4anto May 20, 2025
b3202b4
use same test on ARM64
vot4anto May 20, 2025
0340d49
no pull request on linux
vot4anto May 20, 2025
cca3183
pull request on arm64
vot4anto May 20, 2025
85324ba
correct python on test arm64
vot4anto May 20, 2025
49a0f56
run wheels on ARM64 and Intel
vot4anto May 20, 2025
2f88136
remove artifactv3 deprecated
vot4anto May 20, 2025
b2a57ce
add pyparsing for test
vot4anto May 21, 2025
8aa1907
Update macos_arm64.yaml
vot4anto May 21, 2025
bd0e6ff
add missing libraries for test
vot4anto May 21, 2025
78d1026
Merge branch 'numpy2' of github.com:gem/oq-wheels into numpy2
vot4anto May 21, 2025
6e67079
release 7 for psutil
vot4anto May 21, 2025
30b8002
Test only with OQ
vot4anto May 21, 2025
706a1f1
add pull request also for linux
vot4anto May 21, 2025
5c07d24
3.10 and 3.11 also on x86
vot4anto May 21, 2025
8465c73
type on yaml
vot4anto May 21, 2025
d5f82af
numpy 2.2.6 and correct whl for MacOS
vot4anto May 21, 2025
f99da8b
remove webp from brew
vot4anto May 21, 2025
16019c7
remove calculators test
vot4anto May 21, 2025
c6d5d1c
GDAL 3.10.1 pyproj 3.7.0
vot4anto May 28, 2025
cc87bca
not use submodules
vot4anto May 28, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
# webp, zstd, xz, libtiff cause a conflict with building webp and libtiff
# curl from brew requires zstd, use system curl
# if php is installed, brew tries to reinstall these after installing openblas
brew remove --ignore-dependencies webp zstd libtiff curl php
brew remove --ignore-dependencies zstd libtiff curl php
fi

echo "::group::Get code of project: $REPO_DIR"
Expand Down
101 changes: 43 additions & 58 deletions .github/workflows/linux_x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
description: "tmate debugging enabled"
required: false
default: false
pull_request:

env:
WHEEL_SDIR: wheelhouse
Expand All @@ -19,13 +20,13 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ["ubuntu-22.04"]
python: ["3.12"]
os: ["ubuntu-24.04"]
python: ["3.10", "3.11", "3.12"]
platform: ["x86_64"]
os-name: ["jammy"]
env:
REPO_DIR: psutil
BUILD_COMMIT: release-6.0.0
BUILD_COMMIT: release-7.0.0
WHEEL_SDIR: wheelhouse
PLAT: "${{ matrix.platform }}"
MB_PYTHON_VERSION: "${{ matrix.python }}"
Expand All @@ -36,11 +37,9 @@ jobs:
MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macos-target }}
steps:
- uses: actions/checkout@v4
with:
submodules: true
- uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.12"
- name: get code of psutil
run: |
echo $PATH
Expand All @@ -51,9 +50,9 @@ jobs:
- name: Build Wheel of psutil
run: |
bash -x .github/workflows/wheel.sh
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: wheels
name: "wheels_psutil_${{ matrix.python }}"
path: wheelhouse

build_pyproj:
Expand All @@ -62,13 +61,13 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ["ubuntu-22.04"]
python: ["3.12"]
os: ["ubuntu-24.04"]
python: ["3.10", "3.11", "3.12"]
platform: ["x86_64"]
os-name: ["jammy"]
env:
REPO_DIR: pyproj
BUILD_COMMIT: 3.6.1
BUILD_COMMIT: 3.7.0
WHEEL_SDIR: wheelhouse
PLAT: "${{ matrix.platform }}"
MB_PYTHON_VERSION: "${{ matrix.python }}"
Expand All @@ -79,11 +78,9 @@ jobs:
MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macos-target }}
steps:
- uses: actions/checkout@v4
with:
submodules: true
- uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.12"
- name: get code of pyproj
run: |
echo $PATH
Expand All @@ -94,9 +91,9 @@ jobs:
- name: Build Wheel of pyproj
run: |
bash -x .github/workflows/wheel.sh
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: wheels
name: "wheels_pyproj_${{ matrix.python }}"
path: wheelhouse

build_Fiona:
Expand All @@ -105,43 +102,38 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ["ubuntu-22.04"]
python: ["3.12"]
os: ["ubuntu-24.04"]
python: ["3.10", "3.11", "3.12"]
platform: ["x86_64"]
os-name: ["jammy"]
env:
REPO_DIR: Fiona
BUILD_COMMIT: 1.9.5
GDAL_FIONA: 3.7.3
BUILD_COMMIT: 1.10.1
GDAL_FIONA: 3.10.1
PLAT: "${{ matrix.platform }}"
MB_PYTHON_VERSION: "${{ matrix.python }}"
MB_ML_VER: "2014"
BUILD_DEPENDS: "oldest-supported-numpy cython wheel numpy==1.26.4 setuptools"
TEST_DEPENDS: "oldest-supported-numpy attrs pytest click mock boto3 packaging hypothesis wheel pytz numpy==1.26.4 setuptools"
BUILD_DEPENDS: "oldest-supported-numpy cython wheel numpy==2.2.6 setuptools"
TEST_DEPENDS: "oldest-supported-numpy attrs pytest click mock boto3 packaging hypothesis wheel pytz numpy==2.2.6 setuptools matplotlib pyparsing fsspec gcsfs"
TRAVIS_OS_NAME: ${{ matrix.os-name }}
MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macos-target }}
steps:
- uses: actions/checkout@v4
with:
submodules: true
- uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.12"
- name: get code of Fiona
run: |
echo $PATH
bash -x .github/workflows/build.sh
- name: Build Wheel of Fiona
env:
BUILD_DEPENDS: "oldest-supported-numpy cython==0.29.26 wheel==0.34.2 numpy==1.26.4 setuptools"
TEST_DEPENDS: "oldest-supported-numpy attrs==21.4.0 pytest==6.2.5 click==8.0.3 mock boto3 packaging hypothesis==4.38.1 wheel==0.34.2 pytz numpy==1.26.4 setuptools"
run: |
echo $PATH
sudo apt install python3-virtualenv
bash -x .github/workflows/wheel.sh
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: wheels
name: "wheels_fiona_${{ matrix.python }}"
path: wheelhouse

build_GDAL:
Expand All @@ -150,66 +142,63 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ["ubuntu-22.04"]
python: ["3.12"]
os: ["ubuntu-24.04"]
python: ["3.10", "3.11", "3.12"]
platform: ["x86_64"]
os-name: ["jammy"]
env:
REPO_DIR: gdal
BUILD_COMMIT: v3.7.3
BUILD_COMMIT: v3.10.1
WHEEL_SDIR: wheelhouse
PLAT: "${{ matrix.platform }}"
MB_PYTHON_VERSION: "${{ matrix.python }}"
MB_ML_VER: "2014"
BUILD_DEPENDS: "wheel numpy==1.26.4 setuptools"
TEST_DEPENDS: "numpy==1.26.4 setuptools"
BUILD_DEPENDS: "wheel numpy==2.2.6 setuptools"
TRAVIS_OS_NAME: ${{ matrix.os-name }}
MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macos-target }}
steps:
- uses: actions/checkout@v4
with:
submodules: true
- uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.12"
- name: get code of GDAL
run: |
bash -x .github/workflows/build.sh
- name: Build Wheel of GDAL
run: |
sudo apt install python3-virtualenv
bash -x .github/workflows/wheel.sh
- name: Setup debugging session
uses: mxschmitt/action-tmate@v3
timeout-minutes: 90
if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: wheels
name: "wheels_gdal_${{ matrix.python }}"
path: wheelhouse

test_wheel:
needs: [build_GDAL, build_pyproj, build_Fiona]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
python-version: ["3.12"]
python-version: ["3.10", "3.11", "3.12"]
env:
BRANCH_TEST: ae-py312
BRANCH_TEST: ae_numpy2
PYTHON_VERSION: "${{ matrix.python-version }}"
steps:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: download artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
id: download
with:
name: wheels
path: wheelhouse
- name: "Echo artifact download path"
run: echo ${{steps.download.outputs.download-path}}
- name: Setup debugging session
uses: mxschmitt/action-tmate@v3
timeout-minutes: 90
if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
- name: Test wheels with python ${{ matrix.python-version }}
shell: bash
run: |
Expand All @@ -218,24 +207,20 @@ jobs:
python3 -m venv $HOME/openquake
source $HOME/openquake/bin/activate
pip install -U pip wheel setuptools
#pip install -r https://raw.githubusercontent.com/gem/oq-engine/master/requirements-py311-linux64.txt
cd ${{steps.download.outputs.download-path}}
PYCUT=`echo "${PYTHON_VERSION//.}"`
ls *${PYCUT}*
pip install --force-reinstall *${PYCUT}*
cd $HOME
git clone -b ${BRANCH_TEST} https://github.com/gem/oq-engine.git
cd oq-engine
git status
pip install -r requirements-py312-linux64.txt
pip install -e .
pip install -r requirements-py"${PYCUT}"-linux64.txt
cd $HOME
find . -name \*cp"${PYCUT}"\* -type f -print0 | xargs -0 pip install --force-reinstall
pip install -e oq-engine/
cd $HOME/oq-engine
oq engine --upgrade-db
sleep 5
pip install pytest
sleep 3
pytest -vsx --color=yes openquake/sep/tests/test_utils.py
pytest -vsx --color=yes openquake/sep
pytest -vsx --color=yes openquake/calculators
oq engine --run https://downloads.openquake.org/jobs/risk_test.zip
pytest -vsx --color=yes openquake/hazardlib/tests/gsim/kotha_2020_test.py
oq engine --run https://downloads.openquake.org/jobs/risk_test.zip
Loading
Loading