Skip to content

Commit

Permalink
CI: Update cibuildwheel v0.15
Browse files Browse the repository at this point in the history
  • Loading branch information
snowman2 committed Sep 9, 2023
1 parent c3e8aca commit d886f0b
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .cirrus.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
build_and_store_wheels: &BUILD_AND_STORE_WHEELS
install_cibuildwheel_script:
- python -m pip install cibuildwheel==2.11.2
- python -m pip install cibuildwheel==2.15
run_cibuildwheel_script:
- cibuildwheel
wheels_artifacts:
Expand All @@ -26,7 +26,7 @@ macos_task:
CMAKE_OSX_ARCHITECTURES='arm64'
LDFLAGS="${LDFLAGS} -Wl,-rpath,${CIRRUS_WORKING_DIR}/pyproj/proj_dir/lib"
CIBW_BEFORE_ALL_MACOS: bash ./ci/proj-compile-wheels.sh
CIBW_TEST_REQUIRES: cython pytest numpy
CIBW_TEST_REQUIRES: cython pytest numpy==1.26.0rc1
CIBW_BEFORE_TEST: python -m pip install shapely pandas xarray || echo "Optional requirements install failed"
CIBW_TEST_COMMAND: >
pyproj -v &&
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ jobs:
fail-fast: false
matrix:
include:
- os: ubuntu-20.04
- os: ubuntu-22.04
arch: x86_64
- os: ubuntu-20.04
- os: ubuntu-22.04
arch: i686
- os: macos-11
arch: x86_64
Expand All @@ -70,12 +70,12 @@ jobs:
# - os: macos-11
# arch: universal2
# cmake_osx_architectures: "x86_64;arm64"
- os: "windows-2019"
- os: "windows-2022"
arch: "auto64"
triplet: "x64-windows"
vcpkg_cache: "c:\\vcpkg\\installed"
vcpkg_logs: "c:\\vcpkg\\buildtrees\\**\\*.log"
- os: "windows-2019"
- os: "windows-2022"
arch: "auto32"
triplet: "x86-windows"
vcpkg_cache: "c:\\vcpkg\\installed"
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
cp "$VCPKG_INSTALLATION_ROOT/installed/${{ matrix.triplet }}/share/proj/"* ${GITHUB_WORKSPACE}/pyproj/proj_dir/share/proj/
- name: Build wheels
uses: pypa/cibuildwheel@v2.14.1
uses: pypa/cibuildwheel@v2.15
env:
CIBW_SKIP: "*musllinux* pp*-win*"
CIBW_ARCHS: ${{ matrix.arch }}
Expand All @@ -137,7 +137,7 @@ jobs:
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair --add-path C:/vcpkg/installed/${{ matrix.triplet }}/bin -w {dest_dir} {wheel}"
CIBW_BEFORE_ALL_LINUX: bash ./ci/proj-compile-wheels.sh
CIBW_BEFORE_ALL_MACOS: bash ./ci/proj-compile-wheels.sh
CIBW_TEST_REQUIRES: cython pytest numpy
CIBW_TEST_REQUIRES: cython pytest numpy==1.26.0rc1
CIBW_BEFORE_TEST: python -m pip install shapely pandas xarray || echo "Optional requirements install failed"
CIBW_TEST_COMMAND: >
pyproj -v &&
Expand Down
2 changes: 1 addition & 1 deletion requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
packaging
pytest>3.6
pytest-cov
numpy
numpy==1.26.0rc1
pandas
shapely
xarray

0 comments on commit d886f0b

Please sign in to comment.