Test build of 34c0dd5

.github/workflows/win-wheels.yaml

@@ -4,7 +4,7 @@ name: Windows wheels
 on: [push, pull_request, workflow_dispatch]
 
 env:
-  REF: 1.3.2
+  REF: maint-1.3
 
 # cancel running jobs on new commit to PR
 concurrency:
@@ -30,29 +30,25 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          repository: rasterio/rasterio
-          ref: ${{ env.REF }}
-
-      - name: Add to rasterio setup.cfg
-        shell: bash
-        run: |
-          echo -e "\n[build_ext]" >> setup.cfg
-          echo "include_dirs = C:/vcpkg/installed/x64-windows/include" >> setup.cfg
-          echo "libraries = gdal" >> setup.cfg
-          echo "library_dirs = C:/vcpkg/installed/x64-windows/lib" >> setup.cfg
-          cat setup.cfg
+          submodules: true
 
       - name: Cache vcpkg
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         id: vcpkgcache
         with:
           path: C:/vcpkg/installed
-          key: ${{ runner.os }}-vcpkg-${{ hashFiles('.github/workflows/*') }}
+          key: ${{ runner.os }}-vcpkg-${{ hashFiles('.github/workflows/*', 'vcpkg.json') }}-1
+
+      - name: Bootstrap vcpkg
+        run: |
+          ./vcpkg/bootstrap-vcpkg.bat
 
-      - name: Install GDAL
+      - name: Install C Packages (GDAL et al)
+        shell: bash
         run: |
-          vcpkg install gdal:x64-windows
-          vcpkg list
+          ls -l vcpkg
+          ./vcpkg/vcpkg install --feature-flags="versions,manifest"
+          ./vcpkg/vcpkg list
 
       - name: Debug listing
         shell: bash
@@ -67,6 +63,22 @@ jobs:
         with:
           path: ${{ matrix.vcpkg_logs }}
 
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          repository: rasterio/rasterio
+          fetch-depth: 0
+          ref: ${{ env.REF }}
+
+      - name: Add to rasterio setup.cfg
+        shell: bash
+        run: |
+          echo -e "\n[build_ext]" >> setup.cfg
+          echo "include_dirs = C:/vcpkg/installed/x64-windows/include" >> setup.cfg
+          echo "libraries = gdal" >> setup.cfg
+          echo "library_dirs = C:/vcpkg/installed/x64-windows/lib" >> setup.cfg
+          cat setup.cfg
+
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.3.1
         env:
@@ -77,8 +89,8 @@ jobs:
             GDAL_LIBRARY_PATH="$VCPKG_INSTALL/lib"
             PACKAGE_DATA=1
             GDAL_DATA="$VCPKG_INSTALL/share/gdal"
-            PROJ_LIB="$VCPKG_INSTALL/share/proj/data"
-            GDAL_VERSION="3.5.1"
+            PROJ_LIB="$VCPKG_INSTALL/share/proj"
+            GDAL_VERSION="3.5.2"
           CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel
           CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: delvewheel repair --add-path C:/vcpkg/installed/x64-windows/bin -w {dest_dir} {wheel}
 
@@ -130,3 +142,9 @@ jobs:
           python test_fiona_issue383.py
           cp -R rasterio/tests tests
           PROJ_NETWORK=ON python -m pytest -vv tests -m "not gdalbin" -k "not test_ensure_env_decorator_sets_gdal_data_prefix and not test_tiled_dataset_blocksize_guard and not test_untiled_dataset_blocksize and not test_positional_calculation_byindex and not test_transform_geom_polygon and not test_reproject_error_propagation and not test_issue2353 and not test_info_azure_unsigned and not test_decimated_no_use_overview and not test_datasetreader_ctor_url"
+
+      - name: Check for conflicts with fiona wheel
+        shell: bash
+        run: |
+          python -m pip install --pre fiona
+          python -c "import fiona; import rasterio; print(rasterio.show_versions())"

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "multibuild"]
 	path = multibuild
 	url = https://github.com/multi-build/multibuild.git
+[submodule "vcpkg"]
+	path = vcpkg
+	url = https://github.com/microsoft/vcpkg.git

vcpkg.json

@@ -1,6 +1,9 @@
 {
-    "dependencies": [ "gdal" ],
+    "name": "rasterio",
+    "version": "1.3.3",
+    "dependencies": [ "gdal:x64-windows" ],
+    "builtin-baseline": "57d3194e702a2959e86a6748999ad71fc24f7922",
     "overrides": [
-        { "name": "gdal", "version": "3.4.3#2" }
+        { "name": "proj:x64-windows", "version": "9.0.1" }
     ]
 }