From e66c5737a6410ce47011f02e0f6d70bb6d2eebb8 Mon Sep 17 00:00:00 2001
From: Bousquin <Bousquin.Justin@epa.gov>
Date: Fri, 2 Feb 2024 12:44:43 -0600
Subject: [PATCH] Support py3.8-3.11

---
 .github/workflows/test.yml    | 16 ++++++++++------
 .github/workflows/test_r.yaml |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2f0b06f..6643686 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10', '3.11']
         #exclude:
         #  - os: windows-latest
         #    python-version: "3.7"
@@ -38,11 +38,10 @@ jobs:
           python -m pip install --upgrade pip
           pip install pytest
 
-      - if: ${{ (matrix.os == 'windows-latest') && (matrix.python-version == 3.7) }}
-        run: |
-          pip install pipwin
-          pipwin install gdal
-          pipwin install fiona
+      #Dropped win3.7
+      #pip install pipwin
+      #pipwin install gdal
+      #pipwin install fiona
       
       - if: ${{ (matrix.os == 'windows-latest') && (matrix.python-version == 3.8) }}
         run: |
@@ -59,6 +58,11 @@ jobs:
           pip install https://github.com/cgohlke/geospatial-wheels/releases/download/v2023.7.16/GDAL-3.7.1-cp310-cp310-win_amd64.whl
           pip install https://github.com/cgohlke/geospatial-wheels/releases/download/v2023.7.16/Fiona-1.9.4.post1-cp310-cp310-win_amd64.whl    
       
+      - if: ${{ (matrix.os == 'windows-latest') && (matrix.python-version == 3.11) }}
+        run: |
+          pip install https://github.com/cgohlke/geospatial-wheels/releases/download/v2023.7.16/GDAL-3.7.1-cp311-cp311-win_amd64.whl
+          pip install https://github.com/cgohlke/geospatial-wheels/releases/download/v2023.7.16/Fiona-1.9.4.post1-cp311-cp311-win_amd64.whl    
+      
       - name: Install package and dependencies
         run: |
           python -m pip install --no-deps .
diff --git a/.github/workflows/test_r.yaml b/.github/workflows/test_r.yaml
index b135a92..78d261a 100644
--- a/.github/workflows/test_r.yaml
+++ b/.github/workflows/test_r.yaml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10', '3.11']
         include:
           - os: windows-latest
             python-version: "3.9"