Skip to content

Commit b2a944c

Browse files
authored
DEP: Update wheels & tests with PROJ 9.1.0 (#1132)
1 parent fedb186 commit b2a944c

File tree

5 files changed

+25
-11
lines changed

5 files changed

+25
-11
lines changed

.github/workflows/release.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ concurrency:
1515
cancel-in-progress: true
1616

1717
env:
18-
PROJ_VERSION: "9.0.1"
18+
PROJ_VERSION: "9.1.0"
1919

2020
jobs:
2121
make_sdist:
@@ -81,6 +81,7 @@ jobs:
8181

8282
- uses: actions/setup-python@v2
8383

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

9495
- name: Install PROJ with vcpkg
9596
if: contains(matrix.os, 'windows')
9697
env:
9798
VCPKG_DEFAULT_TRIPLET: ${{ matrix.triplet }}
9899
shell: bash
99100
run: |
100-
vcpkg install proj
101+
cd "$VCPKG_INSTALLATION_ROOT"
102+
git pull > nul
103+
./bootstrap-vcpkg.bat -disableMetrics
104+
vcpkg install --feature-flags="versions,manifests" --x-manifest-root=${GITHUB_WORKSPACE}/ci --x-install-root=$VCPKG_INSTALLATION_ROOT/installed
101105
mkdir -p ${GITHUB_WORKSPACE}/pyproj/proj_dir/share/proj
102-
cp "$VCPKG_INSTALLATION_ROOT/installed/${{ matrix.triplet }}/share/proj/data/"* ${GITHUB_WORKSPACE}/pyproj/proj_dir/share/proj/
106+
cp "$VCPKG_INSTALLATION_ROOT/installed/${{ matrix.triplet }}/share/proj/"* ${GITHUB_WORKSPACE}/pyproj/proj_dir/share/proj/
103107
104108
- name: Build wheels
105109
uses: pypa/[email protected]

.github/workflows/tests.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,12 @@ jobs:
4040
fail-fast: false
4141
matrix:
4242
python-version: ['3.8', '3.9', '3.10', '3.11']
43-
proj-version: ['9.0.1']
43+
proj-version: ['9.1.0']
4444
include:
45-
- python-version: '3.9'
45+
- python-version: '3.8'
4646
proj-version: '8.2.1'
47+
- python-version: '3.9'
48+
proj-version: '9.0.1'
4749
steps:
4850
- uses: actions/checkout@v2
4951

appveyor.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,9 @@ environment:
1313
# See: http://www.appveyor.com/docs/installed-software#python
1414
# build is limited to 60 minutes, without caching each build takes 10-30 minutes
1515
# with caching build takes less than 1 minute
16-
# - PYTHON: "C:\\Python37-x64"
17-
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
18-
# PROJSOURCE: 9.0.1
19-
# BUILD_SHARED_LIBS: ON
2016
- PYTHON: "C:\\Python38-x64"
2117
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
22-
PROJSOURCE: 9.0.1
18+
PROJSOURCE: 9.1.0
2319
BUILD_SHARED_LIBS: ON
2420
# - PYTHON: "C:\\Python39-x64"
2521
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019

ci/vcpkg.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"name": "pyproj",
3+
"version": "3.4.0",
4+
"dependencies": [
5+
{
6+
"name": "proj",
7+
"version>=": "9.1.0"
8+
}
9+
],
10+
"builtin-baseline": "c382312bed3da7be96bdab0f7426eaee1b3e0460"
11+
}

docs/history.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Change Log
44
Latest
55
-------
66
- WHL: Python 3.11 Wheels (issue #1110)
7+
- WHL: Wheels contain PROJ 9.1.0 (pull #1132)
78
- DEP: Minimum PROJ version 8.2 (issue #1011)
89
- BUG: Fix transformer list for 3D transformations in :class:`.TransformerGroup` (discussion #1072)
910
- ENH: Added authority, accuracy, and allow_ballpark kwargs to :class:`.TransformerGroup` (pull #1076)

0 commit comments

Comments
 (0)