From 359df5fa38fccc212f635ea18d35c4cec7c58b15 Mon Sep 17 00:00:00 2001
From: snowman2 <alansnow21@gmail.com>
Date: Tue, 6 Sep 2022 20:33:49 -0500
Subject: [PATCH] DEP: Update wheels & tests with PROJ 9.1.0

---
 .github/workflows/release.yaml | 17 ++++++++---------
 .github/workflows/tests.yaml   |  6 ++++--
 appveyor.yml                   |  6 +-----
 ci/vcpkg.json                  | 11 +++++++++++
 docs/history.rst               |  1 +
 5 files changed, 25 insertions(+), 16 deletions(-)
 create mode 100644 ci/vcpkg.json

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 3ff078ef5..cd8fb9be0 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -15,7 +15,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  PROJ_VERSION: "9.0.1"
+  PROJ_VERSION: "9.1.0"
 
 jobs:
   make_sdist:
@@ -81,15 +81,14 @@ jobs:
 
       - uses: actions/setup-python@v2
 
-      - name: Cache vcpkg
+      - name: Run vcpkg
         if: contains(matrix.os, 'windows')
-        uses: actions/cache@v3
-        id: vcpkgcache
+        uses: lukka/run-vcpkg@v10
+        env:
+          VCPKG_DEFAULT_TRIPLET: ${{ matrix.triplet }}
         with:
-          path: |
-            ${{ matrix.vcpkg_cache }}
-          # bump the last digit to avoid using previous build cache
-          key: ${{ matrix.os }}-${{ matrix.triplet }}-vcpkg-proj9.0.1-cache0
+          vcpkgGitCommitId: 'c382312bed3da7be96bdab0f7426eaee1b3e0460'
+          vcpkgJsonGlob: '**/ci/vcpkg.json'
 
       - name: Install PROJ with vcpkg
         if: contains(matrix.os, 'windows')
@@ -97,7 +96,7 @@ jobs:
           VCPKG_DEFAULT_TRIPLET: ${{ matrix.triplet }}
         shell: bash
         run: |
-          vcpkg install proj
+          vcpkg install --feature-flags="versions,manifests" --x-manifest-root=./ci
           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/
 
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index fb3f746e4..47a640829 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -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
 
diff --git a/appveyor.yml b/appveyor.yml
index 8e4a4a8af..3bea12ce6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -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
diff --git a/ci/vcpkg.json b/ci/vcpkg.json
new file mode 100644
index 000000000..88aa3fb8e
--- /dev/null
+++ b/ci/vcpkg.json
@@ -0,0 +1,11 @@
+{
+    "name": "pyproj",
+    "version": "3.4.0",
+    "dependencies": [
+        {
+            "name": "proj",
+            "version>=": "9.1.0"
+        }
+    ],
+    "builtin-baseline": "c382312bed3da7be96bdab0f7426eaee1b3e0460"
+}
diff --git a/docs/history.rst b/docs/history.rst
index f2b9b33f1..96f78c389 100644
--- a/docs/history.rst
+++ b/docs/history.rst
@@ -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)