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

CI: Update cibuildwheel v0.16 #1330

Merged
merged 1 commit into from
Sep 19, 2023
Merged

CI: Update cibuildwheel v0.16 #1330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions .cirrus.yml
View file
Open in desktop
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.16
run_cibuildwheel_script:
- cibuildwheel
wheels_artifacts:
Expand All @@ -14,7 +14,7 @@ macos_task:
image: ghcr.io/cirruslabs/macos-monterey-xcode
env:
PATH: /opt/homebrew/opt/python@3.10/bin:$PATH
CIBW_SKIP: "*musllinux*"
CIBW_SKIP: "*musllinux* pp*"
CIBW_ARCHS_MACOS: arm64
CIBW_ENVIRONMENT_MACOS:
PROJ_WHEEL=true
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 --config-settings=setup-args="-Dallow-noblas=true"
CIBW_BEFORE_TEST: python -m pip install shapely pandas xarray || echo "Optional requirements install failed"
CIBW_TEST_COMMAND: >
pyproj -v &&
Expand Down
21 changes: 13 additions & 8 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ jobs:
fail-fast: false
matrix:
include:
- os: ubuntu-20.04
- os: ubuntu-22.04
arch: x86_64
- os: ubuntu-20.04
arch: i686
# - os: ubuntu-22.04
# arch: i686
- os: macos-11
arch: x86_64
cmake_osx_architectures: 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 All @@ -86,6 +86,11 @@ jobs:

- uses: actions/setup-python@v4

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

- name: Cache vcpkg
if: contains(matrix.os, 'windows')
Expand All @@ -111,9 +116,9 @@ 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.16
env:
CIBW_SKIP: "*musllinux* pp*-win*"
CIBW_SKIP: "*musllinux* pp*-win* pp31*"
CIBW_ARCHS: ${{ matrix.arch }}
CIBW_ENVIRONMENT_LINUX:
PROJ_WHEEL=true
Expand All @@ -137,7 +142,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 --config-settings=setup-args="-Dallow-noblas=true"
CIBW_BEFORE_TEST: python -m pip install shapely pandas xarray || echo "Optional requirements install failed"
CIBW_TEST_COMMAND: >
pyproj -v &&
Expand Down