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.

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

DEP: Update wheels & tests with PROJ 9.1.0 #1132

Merged
merged 3 commits into from Sep 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 8 additions & 4 deletions .github/workflows/release.yaml
Expand Up @@ -15,7 +15,7 @@ concurrency:
cancel-in-progress: true

env:
PROJ_VERSION: "9.0.1"
PROJ_VERSION: "9.1.0"

jobs:
make_sdist:
Expand Down Expand Up @@ -81,6 +81,7 @@ jobs:

- uses: actions/setup-python@v2


- name: Cache vcpkg
if: contains(matrix.os, 'windows')
uses: actions/cache@v3
Expand All @@ -89,17 +90,20 @@ jobs:
path: |
${{ matrix.vcpkg_cache }}
# bump the last digit to avoid using previous build cache
key: ${{ matrix.os }}-${{ matrix.triplet }}-vcpkg-proj9.0.1-cache0
key: ${{ matrix.os }}-${{ matrix.triplet }}-vcpkg-proj${{ env.PROJ_VERSION }}-cache0

- name: Install PROJ with vcpkg
if: contains(matrix.os, 'windows')
env:
VCPKG_DEFAULT_TRIPLET: ${{ matrix.triplet }}
shell: bash
run: |
vcpkg install proj
cd "$VCPKG_INSTALLATION_ROOT"
git pull > nul
./bootstrap-vcpkg.bat -disableMetrics
vcpkg install --feature-flags="versions,manifests" --x-manifest-root=${GITHUB_WORKSPACE}/ci --x-install-root=$VCPKG_INSTALLATION_ROOT/installed
mkdir -p ${GITHUB_WORKSPACE}/pyproj/proj_dir/share/proj
cp "$VCPKG_INSTALLATION_ROOT/installed/${{ matrix.triplet }}/share/proj/data/"* ${GITHUB_WORKSPACE}/pyproj/proj_dir/share/proj/
cp "$VCPKG_INSTALLATION_ROOT/installed/${{ matrix.triplet }}/share/proj/"* ${GITHUB_WORKSPACE}/pyproj/proj_dir/share/proj/

- name: Build wheels
uses: pypa/cibuildwheel@v2.9.0
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/tests.yaml
Expand Up @@ -40,10 +40,12 @@ jobs:
fail-fast: false
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11']
proj-version: ['9.0.1']
proj-version: ['9.1.0']
include:
- python-version: '3.9'
- python-version: '3.8'
proj-version: '8.2.1'
- python-version: '3.9'
proj-version: '9.0.1'
steps:
- uses: actions/checkout@v2

Expand Down
6 changes: 1 addition & 5 deletions appveyor.yml
Expand Up @@ -13,13 +13,9 @@ environment:
# See: http://www.appveyor.com/docs/installed-software#python
# build is limited to 60 minutes, without caching each build takes 10-30 minutes
# with caching build takes less than 1 minute
# - PYTHON: "C:\\Python37-x64"
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
# PROJSOURCE: 9.0.1
# BUILD_SHARED_LIBS: ON
- PYTHON: "C:\\Python38-x64"
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
PROJSOURCE: 9.0.1
PROJSOURCE: 9.1.0
BUILD_SHARED_LIBS: ON
# - PYTHON: "C:\\Python39-x64"
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
Expand Down
11 changes: 11 additions & 0 deletions ci/vcpkg.json
@@ -0,0 +1,11 @@
{
"name": "pyproj",
"version": "3.4.0",
"dependencies": [
{
"name": "proj",
"version>=": "9.1.0"
}
],
"builtin-baseline": "c382312bed3da7be96bdab0f7426eaee1b3e0460"
}
1 change: 1 addition & 0 deletions docs/history.rst
Expand Up @@ -4,6 +4,7 @@ Change Log
Latest
-------
- WHL: Python 3.11 Wheels (issue #1110)
- WHL: Wheels contain PROJ 9.1.0 (pull #1132)
- DEP: Minimum PROJ version 8.2 (issue #1011)
- BUG: Fix transformer list for 3D transformations in :class:`.TransformerGroup` (discussion #1072)
- ENH: Added authority, accuracy, and allow_ballpark kwargs to :class:`.TransformerGroup` (pull #1076)
Expand Down