Skip to content

Commit 3627e94

Browse files
authored
CI: Update cibuildwheel v0.16 (#1330)
1 parent dd80043 commit 3627e94

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

.cirrus.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
build_and_store_wheels: &BUILD_AND_STORE_WHEELS
22
install_cibuildwheel_script:
3-
- python -m pip install cibuildwheel==2.11.2
3+
- python -m pip install cibuildwheel==2.16
44
run_cibuildwheel_script:
55
- cibuildwheel
66
wheels_artifacts:
@@ -14,7 +14,7 @@ macos_task:
1414
image: ghcr.io/cirruslabs/macos-monterey-xcode
1515
env:
1616
PATH: /opt/homebrew/opt/[email protected]/bin:$PATH
17-
CIBW_SKIP: "*musllinux*"
17+
CIBW_SKIP: "*musllinux* pp*"
1818
CIBW_ARCHS_MACOS: arm64
1919
CIBW_ENVIRONMENT_MACOS:
2020
PROJ_WHEEL=true
@@ -26,7 +26,7 @@ macos_task:
2626
CMAKE_OSX_ARCHITECTURES='arm64'
2727
LDFLAGS="${LDFLAGS} -Wl,-rpath,${CIRRUS_WORKING_DIR}/pyproj/proj_dir/lib"
2828
CIBW_BEFORE_ALL_MACOS: bash ./ci/proj-compile-wheels.sh
29-
CIBW_TEST_REQUIRES: cython pytest numpy
29+
CIBW_TEST_REQUIRES: cython pytest numpy --config-settings=setup-args="-Dallow-noblas=true"
3030
CIBW_BEFORE_TEST: python -m pip install shapely pandas xarray || echo "Optional requirements install failed"
3131
CIBW_TEST_COMMAND: >
3232
pyproj -v &&

.github/workflows/release.yaml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ jobs:
5858
fail-fast: false
5959
matrix:
6060
include:
61-
- os: ubuntu-20.04
61+
- os: ubuntu-22.04
6262
arch: x86_64
63-
- os: ubuntu-20.04
64-
arch: i686
63+
# - os: ubuntu-22.04
64+
# arch: i686
6565
- os: macos-11
6666
arch: x86_64
6767
cmake_osx_architectures: x86_64
@@ -71,12 +71,12 @@ jobs:
7171
# - os: macos-11
7272
# arch: universal2
7373
# cmake_osx_architectures: "x86_64;arm64"
74-
- os: "windows-2019"
74+
- os: "windows-2022"
7575
arch: "auto64"
7676
triplet: "x64-windows"
7777
vcpkg_cache: "c:\\vcpkg\\installed"
7878
vcpkg_logs: "c:\\vcpkg\\buildtrees\\**\\*.log"
79-
- os: "windows-2019"
79+
- os: "windows-2022"
8080
arch: "auto32"
8181
triplet: "x86-windows"
8282
vcpkg_cache: "c:\\vcpkg\\installed"
@@ -87,6 +87,11 @@ jobs:
8787

8888
- uses: actions/setup-python@v4
8989

90+
- name: Setup MSVC (32-bit)
91+
if: ${{ matrix.triplet == 'x86-windows' }}
92+
uses: bus1/cabuild/action/msdevshell@e22aba57d6e74891d059d66501b6b5aed8123c4d # v1
93+
with:
94+
architecture: 'x86'
9095

9196
- name: Cache vcpkg
9297
if: contains(matrix.os, 'windows')
@@ -112,9 +117,9 @@ jobs:
112117
cp "$VCPKG_INSTALLATION_ROOT/installed/${{ matrix.triplet }}/share/proj/"* ${GITHUB_WORKSPACE}/pyproj/proj_dir/share/proj/
113118
114119
- name: Build wheels
115-
uses: pypa/cibuildwheel@v2.14.1
120+
uses: pypa/cibuildwheel@v2.16
116121
env:
117-
CIBW_SKIP: "*musllinux* pp*-win*"
122+
CIBW_SKIP: "*musllinux* pp*-win* pp31*"
118123
CIBW_ARCHS: ${{ matrix.arch }}
119124
CIBW_ENVIRONMENT_LINUX:
120125
PROJ_WHEEL=true
@@ -138,7 +143,7 @@ jobs:
138143
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair --add-path C:/vcpkg/installed/${{ matrix.triplet }}/bin -w {dest_dir} {wheel}"
139144
CIBW_BEFORE_ALL_LINUX: bash ./ci/proj-compile-wheels.sh
140145
CIBW_BEFORE_ALL_MACOS: bash ./ci/proj-compile-wheels.sh
141-
CIBW_TEST_REQUIRES: cython pytest numpy
146+
CIBW_TEST_REQUIRES: cython pytest numpy --config-settings=setup-args="-Dallow-noblas=true"
142147
CIBW_BEFORE_TEST: python -m pip install shapely pandas xarray || echo "Optional requirements install failed"
143148
CIBW_TEST_COMMAND: >
144149
pyproj -v &&

0 commit comments

Comments
 (0)