Test with Python CKAN 2.10 / Python 3.10. Remove CKAN 2.7/2.8 tests

.github/workflows/test-postgis.yml

@@ -17,7 +17,7 @@ jobs:
     needs: lint
     strategy:
       matrix:
-        ckan-version: [2.9, 2.9-py2, 2.8, 2.7]
+        ckan-version: [2.9, 2.9-py2]
       fail-fast: false
     
     name: CKAN ${{ matrix.ckan-version }}

.github/workflows/test.yml

@@ -1,5 +1,5 @@
 name: Tests
-on: [push, pull_request]
+on: pull_request
 
 jobs:
   lint:
@@ -20,13 +20,19 @@ jobs:
         include:
           - ckan-version: "2.10"
             solr-image: "2.10-spatial"
+            harvest-tag: 'v1.4.2'
+            requirements-file: 'requirements.txt'
           - ckan-version: 2.9
             solr-image: 2.9-solr8-spatial
+            harvest-tag: 'v1.4.2'
+            requirements-file: 'requirements.txt'
           - ckan-version: 2.9-py2
             solr-image: 2.9-py2-solr8-spatial
+            harvest-tag: 'v1.4.0'
+            requirements-file: 'requirements-py2.txt'
       fail-fast: false
     
-    name: CKAN ${{ matrix.ckan-version }}
+    name: CKAN ${{ matrix.ckan-version }}, Solr ${{ matrix.solr-image }}
     runs-on: ubuntu-latest
     container:
       image: openknowledge/ckan-dev:${{ matrix.ckan-version }}
@@ -52,13 +58,7 @@ jobs:
     
     steps:
     - uses: actions/checkout@v3
-    - name: Install harvester
+  
-      run: |
-        git clone https://github.com/ckan/ckanext-harvest
-        cd ckanext-harvest
-        pip install -r pip-requirements.txt
-        pip install -r dev-requirements.txt
-        pip install -e .
     - name: Install dependencies (common)
       run: |
         apk add --no-cache \
@@ -71,18 +71,25 @@ jobs:
           gcc \
           libxml2-dev \
           libxslt-dev
-    - name: Install dependencies (python2)
+
-      if: ${{ matrix.ckan-version == '2.9-py2' || matrix.ckan-version == '2.8' || matrix.ckan-version == '2.7' }}
+    - name: Install dependencies from ${{ matrix.requirements-file }}
       run: |
-        apk add --no-cache \
+        pip install -r ${{ matrix.requirements-file }}
-          python2-dev
+
-        pip install -r requirements-py2.txt
+    - name: Install harvester
-    - name: Install dependencies (python3)
-      if: ${{ matrix.ckan-version != '2.9-py2' && matrix.ckan-version != '2.8' && matrix.ckan-version != '2.7' }}
       run: |
-        apk add --no-cache \
+        echo "Installing harvester from tag ${{ matrix.harvest-tag }}"
-          python3-dev
+        git clone --depth 1 --branch ${{ matrix.harvest-tag }} https://github.com/ckan/ckanext-harvest
-        pip install -r requirements.txt
+        cd ckanext-harvest
+        echo "upgrade pip"
+        pip install --upgrade pip
+        echo "Installing harvester requirements"
+        pip install -r pip-requirements.txt
+        echo "Installing harvester dev-requirements"
+        pip install -r dev-requirements.txt
+        echo "Installing harvester extension"
+        pip install -e .
+
     - name: Install requirements
       run: |
         pip install -e .

README.rst

@@ -27,6 +27,9 @@ Supported Versions
 ------------------
 
 ckanext-spatial >= 2.0.0 supports CKAN 2.9 and CKAN 2.10.
+Check the
+[tested enviroments](https://github.com/ckan/ckanext-spatial/blob/master/.github/workflows/test.yml)
+for more details.  
 
 For previous CKAN versions please use the v1.x tags.
 

doc/install.rst

@@ -174,7 +174,7 @@ When running the spatial harvesters
     File "xmlschema.pxi", line 102, in lxml.etree.XMLSchema.__init__ (src/lxml/lxml.etree.c:154475)
     lxml.etree.XMLSchemaParseError: local list type: A type, derived by list or union, must have the simple ur-type definition as base type, not '{http://www.opengis.net/gml}doubleList'., line 1
 
-The XSD validation used by the spatial harvesters requires libxml2 ersion 2.9.
+The XSD validation used by the spatial harvesters requires libxml2 version 2.9.
 
 With CKAN you would probably have installed an older version from your
 distribution. (e.g. with ``sudo apt-get install libxml2-dev``). You need to

requirements-py2.txt

@@ -7,4 +7,7 @@ argparse
 pyparsing>=2.1.10
 requests>=1.1.0
 six
-geojson==2.5.0
+geojson==2.5.0
+# Harvest extension install 1.3 which try to install
+# setuptools>=61.2 which is not compatible with python 2.7
+pika==1.1.0

requirements.txt

@@ -1,10 +1,18 @@
 ckantoolkit
-Shapely>=1.2.13,<2.0.0
-pyproj==2.6.1
-OWSLib==0.18.0
 lxml>=2.3
 argparse
 pyparsing>=2.1.10
 requests>=1.1.0
 six
-geojson==2.5.0
+
+Shapely>=1.2.13,<2.0.0; python_version < '3.9'
+Shapely==2.0.1; python_version >= '3.9'
+
+pyproj==2.6.1; python_version < '3.9'
+pyproj==3.4.1; python_version >= '3.9'
+
+OWSLib==0.18.0; python_version < '3.9'
+OWSLib==0.28.1; python_version >= '3.9'
+
+geojson==2.5.0; python_version < '3.9'
+geojson==3.0.1; python_version >= '3.9'