From 5e0b7db10d06807631224f431d4a3d630db133f4 Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Tue, 25 Jul 2023 13:54:16 -0300
Subject: [PATCH 1/8] Fix requirements

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index fa3e6989..057d4ed9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ argparse
 pyparsing>=2.1.10
 requests>=1.1.0
 six
-
+cython==0.29.36; python_version < '3.9'
 pyproj==2.6.1; python_version < '3.9'
 pyproj==3.4.1; python_version >= '3.9'
 

From e808f02702b37f969d3508cfe9f90db4b5689eb7 Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Wed, 26 Jul 2023 09:27:25 -0300
Subject: [PATCH 2/8] Fix pyproj req

---
 .github/workflows/test-postgis.yml | 15 +++++++++++++++
 .github/workflows/test.yml         | 18 ++++++++++++++++++
 requirements-py2.txt               |  1 +
 3 files changed, 34 insertions(+)

diff --git a/.github/workflows/test-postgis.yml b/.github/workflows/test-postgis.yml
index fc357549..d4a42d16 100644
--- a/.github/workflows/test-postgis.yml
+++ b/.github/workflows/test-postgis.yml
@@ -53,6 +53,7 @@ jobs:
         psql --host=postgres --username=postgres --command="CREATE USER datastore_write WITH PASSWORD 'pass' NOSUPERUSER NOCREATEDB NOCREATEROLE;"
         psql --host=postgres --username=postgres --command="CREATE USER datastore_read WITH PASSWORD 'pass' NOSUPERUSER NOCREATEDB NOCREATEROLE;"
         createdb --encoding=utf-8 --host=postgres --username=postgres --owner=datastore_write datastore_test
+
     - name: Install harvester
       run: |
         git clone https://github.com/ckan/ckanext-harvest
@@ -72,6 +73,19 @@ jobs:
           gcc \
           libxml2-dev \
           libxslt-dev
+
+    - name: Patch to test pyproj
+      if: ${{ matrix.ckan-version == '2.9-py2' || matrix.ckan-version == '2.8' || matrix.ckan-version == '2.7' }}
+      run: |
+        pip install cython==0.29.36
+        pip install --no-use-pep517 pyproj==2.2.2
+
+    - name: Patch to test pyproj
+      if: ${{ matrix.ckan-version == '2.9' }}
+      run: |
+        pip install cython==0.29.36
+        pip install --no-use-pep517 pyproj==2.6.1
+
     - name: Install dependencies (python2)
       if: ${{ matrix.ckan-version == '2.9-py2' || matrix.ckan-version == '2.8' || matrix.ckan-version == '2.7' }}
       run: |
@@ -86,6 +100,7 @@ jobs:
           python3-dev
         pip install -r requirements.txt
         pip install -r requirements-postgis.txt
+
     - name: Install requirements
       run: |
         pip install -e .
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ca970f89..6e8bb2bc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -89,6 +89,24 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-spatial-ckan-${{ matrix.ckan-version }}-${{ hashFiles('*requirements*.txt') }}
 
+    - name: Patch to test pyproj
+      if: ${{ matrix.ckan-version == '2.9' }}
+      run: |
+        pip install cython==0.29.36
+        pip install --no-use-pep517 pyproj==2.6.1
+
+    - name: Patch to test pyproj
+      if: ${{ matrix.ckan-version == '2.10' }}
+      run: |
+        pip install cython==0.29.36
+        pip install --no-use-pep517 pyproj==3.4.1
+
+    - name: Patch to test pyproj
+      if: ${{ matrix.ckan-version == '2.9-py2' }}
+      run: |
+        pip install cython==0.29.36
+        pip install --no-use-pep517 pyproj==2.2.2
+
     - name: Install dependencies from ${{ matrix.requirements-file }}
       if: steps.cache.outputs.cache-hit != 'true'
       run: |
diff --git a/requirements-py2.txt b/requirements-py2.txt
index cdd3536c..8eff5829 100644
--- a/requirements-py2.txt
+++ b/requirements-py2.txt
@@ -1,4 +1,5 @@
 ckantoolkit
+cython==0.29.36
 Shapely>=1.2.13,<2.0.0  
 pyproj==2.2.2
 OWSLib==0.18.0

From 9534052bcc91166febe38e6d2ae4b5a118bde246 Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Wed, 26 Jul 2023 10:56:45 -0300
Subject: [PATCH 3/8] Split harvter version

---
 .github/workflows/test.yml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6e8bb2bc..be94a82c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,12 +23,15 @@ jobs:
           - ckan-version: "2.10"
             solr-image: "2.10-spatial"
             requirements-file: 'requirements.txt'
+            harvester-version: 'master'
           - ckan-version: 2.9
             solr-image: 2.9-solr8-spatial
             requirements-file: 'requirements.txt'
+            harvester-version: 'master'
           - ckan-version: 2.9-py2
             solr-image: 2.9-py2-solr8-spatial
             requirements-file: 'requirements-py2.txt'
+            harvester-version: '1.4.2'
       fail-fast: false
     
     name: CKAN ${{ matrix.ckan-version }}, Solr ${{ matrix.solr-image }}
@@ -95,16 +98,10 @@ jobs:
         pip install cython==0.29.36
         pip install --no-use-pep517 pyproj==2.6.1
 
-    - name: Patch to test pyproj
-      if: ${{ matrix.ckan-version == '2.10' }}
-      run: |
-        pip install cython==0.29.36
-        pip install --no-use-pep517 pyproj==3.4.1
-
     - name: Patch to test pyproj
       if: ${{ matrix.ckan-version == '2.9-py2' }}
       run: |
-        pip install cython==0.29.36
+        pip install cython==0.28.4
         pip install --no-use-pep517 pyproj==2.2.2
 
     - name: Install dependencies from ${{ matrix.requirements-file }}
@@ -116,7 +113,7 @@ jobs:
       if: steps.cache.outputs.cache-hit != 'true'
       run: |
         echo "Installing harvester"
-        git clone --depth 1 https://github.com/ckan/ckanext-harvest
+        git clone --depth 1 --branch ${{ matrix.harvester-version }} https://github.com/ckan/ckanext-harvest
         cd ckanext-harvest
         echo "upgrade pip"
         pip install --upgrade pip

From fbb2bde70170e819426a83b683ac6d8f43253b90 Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Wed, 26 Jul 2023 11:06:50 -0300
Subject: [PATCH 4/8] Split harvester versions

---
 .github/workflows/test-postgis.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-postgis.yml b/.github/workflows/test-postgis.yml
index d4a42d16..f3c21253 100644
--- a/.github/workflows/test-postgis.yml
+++ b/.github/workflows/test-postgis.yml
@@ -17,7 +17,11 @@ jobs:
     needs: lint
     strategy:
       matrix:
-        ckan-version: [2.9, 2.9-py2]
+        include:
+          - ckan-version: 2.9
+            harvester-version: 'master'
+          - ckan-version: 2.9-py2
+            harvester-version: '1.4.2'
       fail-fast: false
     
     name: CKAN ${{ matrix.ckan-version }}
@@ -56,7 +60,7 @@ jobs:
 
     - name: Install harvester
       run: |
-        git clone https://github.com/ckan/ckanext-harvest
+        git clone --branch ${{ matrix.harvester-version }} https://github.com/ckan/ckanext-harvest
         cd ckanext-harvest
         pip install -r pip-requirements.txt
         pip install -r dev-requirements.txt

From c82c39b8e3ccca7884f7713349f52d3fd8c5fc4c Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Wed, 26 Jul 2023 11:17:49 -0300
Subject: [PATCH 5/8] v

---
 .github/workflows/test-postgis.yml | 2 +-
 .github/workflows/test.yml         | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-postgis.yml b/.github/workflows/test-postgis.yml
index f3c21253..51562526 100644
--- a/.github/workflows/test-postgis.yml
+++ b/.github/workflows/test-postgis.yml
@@ -21,7 +21,7 @@ jobs:
           - ckan-version: 2.9
             harvester-version: 'master'
           - ckan-version: 2.9-py2
-            harvester-version: '1.4.2'
+            harvester-version: 'v1.4.2'
       fail-fast: false
     
     name: CKAN ${{ matrix.ckan-version }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index be94a82c..b7870266 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -31,7 +31,7 @@ jobs:
           - ckan-version: 2.9-py2
             solr-image: 2.9-py2-solr8-spatial
             requirements-file: 'requirements-py2.txt'
-            harvester-version: '1.4.2'
+            harvester-version: 'v1.4.2'
       fail-fast: false
     
     name: CKAN ${{ matrix.ckan-version }}, Solr ${{ matrix.solr-image }}
@@ -92,6 +92,12 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-spatial-ckan-${{ matrix.ckan-version }}-${{ hashFiles('*requirements*.txt') }}
 
+    - name: Patch to test pyproj
+      if: ${{ matrix.ckan-version == '2.10' }}
+      run: |
+        pip install cython>3
+        pip install --no-use-pep517 pyproj==3.4.1
+
     - name: Patch to test pyproj
       if: ${{ matrix.ckan-version == '2.9' }}
       run: |

From 208781f6b57a567f01a585970e0e2bbbcedd8a32 Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Wed, 26 Jul 2023 11:26:04 -0300
Subject: [PATCH 6/8] fix ckan 2.10 test

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b7870266..559543f6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -96,7 +96,7 @@ jobs:
       if: ${{ matrix.ckan-version == '2.10' }}
       run: |
         pip install cython>3
-        pip install --no-use-pep517 pyproj==3.4.1
+        pip install pyproj==3.4.1
 
     - name: Patch to test pyproj
       if: ${{ matrix.ckan-version == '2.9' }}

From 961f00fe5b714b9aae87b769067b9dca084e05d0 Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Thu, 27 Jul 2023 12:11:52 -0300
Subject: [PATCH 7/8] Try to fix reqs

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 057d4ed9..c0c58d1a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ requests>=1.1.0
 six
 cython==0.29.36; python_version < '3.9'
 pyproj==2.6.1; python_version < '3.9'
-pyproj==3.4.1; python_version >= '3.9'
+pyproj @ git+https://github.com/pyproj4/pyproj.git@main; python_version >= '3.9'
 
 Shapely==2.0.1
 OWSLib==0.28.1

From c8fd28c25158adeb32d3c8c0c05d1c23caa84f38 Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Thu, 27 Jul 2023 12:12:35 -0300
Subject: [PATCH 8/8] remove custom install for CKAN 2.10

---
 .github/workflows/test.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 559543f6..abc2340e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -92,12 +92,6 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-spatial-ckan-${{ matrix.ckan-version }}-${{ hashFiles('*requirements*.txt') }}
 
-    - name: Patch to test pyproj
-      if: ${{ matrix.ckan-version == '2.10' }}
-      run: |
-        pip install cython>3
-        pip install pyproj==3.4.1
-
     - name: Patch to test pyproj
       if: ${{ matrix.ckan-version == '2.9' }}
       run: |