tests: Add Github Actions tests

.github/workflows/test.yml

@@ -0,0 +1,80 @@
+name: Tests
+on: [push, pull_request]
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    container:
+      image: python:2.7.18-buster
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install requirements
+        run: pip install flake8 pycodestyle
+      - name: Check syntax
+        run: flake8 --statistics --show-source ckanext
+
+  test:
+    needs: lint
+    strategy:
+      matrix:
+        ckan-version: [2.8]
+      fail-fast: false
+
+    name: CKAN ${{ matrix.ckan-version }}
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: ckan/ckan-postgres-dev:${{ matrix.ckan-version }}
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: postgres
+        ports:
+          - 5432:5432
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+      redis:
+        image: redis:3
+    env:
+      CKAN_SQLALCHEMY_URL: postgresql://ckan_default:pass@postgres/ckan_test
+      CKAN_DATASTORE_WRITE_URL: postgresql://datastore_write:pass@postgres/datastore_test
+      CKAN_DATASTORE_READ_URL: postgresql://datastore_read:pass@postgres/datastore_test
+      CKAN_SOLR_URL: http://solr:8983/solr/ckan
+      CKAN_REDIS_URL: redis://redis:6379/1
+      CKAN_SITE_URL: http://test.ckan.net
+      WORKDIR: /__w/ckanext-geocat/ckanext-geocat
+      SOLR_CONFIG_CKAN_DIR: /opt/solr/server/solr/ckan/conf
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Create solr container
+      run: |
+        git clone https://github.com/opendata-swiss/ckanext-switzerland-ng.git
+        docker create --name test_solr --network ${{ job.container.network }} --network-alias solr \
+          --workdir $WORKDIR --publish 8983:8983 \
+          -e SOLR_HEAP=1024m -e GITHUB_ACTIONS=true -e CI=true \
+          -v "${{ github.workspace }}/ckanext-switzerland-ng/solr/schema.xml":"$SOLR_CONFIG_CKAN_DIR/schema.xml" \
+          -v "${{ github.workspace }}/ckanext-switzerland-ng/solr/english_stop.txt":"$SOLR_CONFIG_CKAN_DIR/english_stop.txt" \
+          -v "${{ github.workspace }}/ckanext-switzerland-ng/solr/fr_elision.txt":"$SOLR_CONFIG_CKAN_DIR/fr_elision.txt" \
+          -v "${{ github.workspace }}/ckanext-switzerland-ng/solr/french_stop.txt":"$SOLR_CONFIG_CKAN_DIR/french_stop.txt" \
+          -v "${{ github.workspace }}/ckanext-switzerland-ng/solr/german_dictionary.txt":"$SOLR_CONFIG_CKAN_DIR/german_dictionary.txt" \
+          -v "${{ github.workspace }}/ckanext-switzerland-ng/solr/german_stop.txt":"$SOLR_CONFIG_CKAN_DIR/german_stop.txt" \
+          -v "${{ github.workspace }}/ckanext-switzerland-ng/solr/italian_stop.txt":"$SOLR_CONFIG_CKAN_DIR/italian_stop.txt" \
+          -v "${{ github.workspace }}/ckanext-switzerland-ng/solr/solrconfig.xml":"$SOLR_CONFIG_CKAN_DIR/solrconfig.xml" \
+          ckan/ckan-solr:${{ matrix.ckan-version }}
+        docker start test_solr
+    - name: Create ckan container
+      run: |
+        docker create --name test_ckan --network ${{ job.container.network }} --network-alias ckan \
+          -e "HOME=/github/home" -e GITHUB_ACTIONS=true -e CI=true -v "/var/run/docker.sock":"/var/run/docker.sock" \
+          -v "/home/runner/work":"/__w" -v "/home/runner/work/_temp":"/__w/_temp" \
+          -v "/home/runner/work/_actions":"/__w/_actions" -v "/opt/hostedtoolcache":"/__t" \
+          -v "/home/runner/work/_temp/_github_home":"/github/home" \
+          -v "/home/runner/work/_temp/_github_workflow":"/github/workflow" \
+          --entrypoint "tail" openknowledge/ckan-dev:${{ matrix.ckan-version }} "-f" "/dev/null"
+        docker start test_ckan
+    - name: Install requirements and set up database
+      run: |
+        docker exec test_ckan $WORKDIR/bin/install_test_requirements.sh ${{ matrix.ckan-version }}
+    - name: Run tests
+      run: | 
+        docker exec test_ckan nosetests --ckan --with-pylons=$WORKDIR/test.ini \
+          --with-coverage --cover-package=ckanext.geocat --cover-inclusive --cover-erase --cover-tests $WORKDIR/ckanext/geocat

bin/install_test_requirements.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+
+WORKDIR=/__w/ckanext-geocat/ckanext-geocat
+
+pip install --upgrade pip
+
+# Install ckanext-geocat
+pip install -r "$WORKDIR"/requirements.txt
+pip install -r "$WORKDIR"/dev-requirements.txt
+pip install -e "$WORKDIR"/
+
+# Install ckanext dependencies
+pip install -e git+https://github.com/ckan/ckanext-fluent.git#egg=ckanext-fluent
+pip install -e git+https://github.com/ckan/ckanext-hierarchy.git#egg=ckanext-hierarchy
+pip install -e git+https://github.com/ckan/ckanext-xloader.git#egg=ckanext-xloader
+pip install -r https://raw.githubusercontent.com/ckan/ckanext-xloader/master/requirements.txt
+
+# Last commit before support for Python 2 was dropped
+pip install -e git+https://github.com/ckan/[email protected]#egg=ckanext-harvest
+pip install -r https://raw.githubusercontent.com/ckan/ckanext-harvest/v1.4.2/requirements.txt
+
+# Last commit before support for Python 2 was dropped
+pip install -e git+https://github.com/ckan/ckanext-dcat.git@0c26bed5b7a3a7fca8e7b78e338aace096e0ebf6#egg=ckanext-dcat
+pip install -r https://raw.githubusercontent.com/ckan/ckanext-dcat/0c26bed5b7a3a7fca8e7b78e338aace096e0ebf6/requirements-py2.txt
+
+# Last commit before support for Python 2 was dropped
+pip install -e git+https://github.com/ckan/[email protected]#egg=ckanext-showcase
+
+# Our ckanexts
+pip install -e git+https://github.com/opendata-swiss/ckanext-dcatapchharvest.git#egg=ckanext-dcatapchharvest
+pip install -r https://raw.githubusercontent.com/opendata-swiss/ckanext-dcatapchharvest/master/requirements.txt
+pip install -e git+https://github.com/opendata-swiss/ckanext-harvester_dashboard.git#egg=ckanext-harvester_dashboard
+pip install -r https://raw.githubusercontent.com/opendata-swiss/ckanext-harvester_dashboard/master/requirements.txt
+pip install -e git+https://github.com/opendata-swiss/ckanext-subscribe.git#egg=ckanext-subscribe
+pip install -r https://raw.githubusercontent.com/opendata-swiss/ckanext-subscribe/master/requirements.txt
+pip install -e git+https://github.com/opendata-swiss/ckanext-switzerland-ng.git#egg=ckanext-switzerland-ng
+pip install -r https://raw.githubusercontent.com/opendata-swiss/ckanext-switzerland-ng/master/requirements.txt
+pip install -e git+https://github.com/opendata-swiss/ckanext-scheming.git#egg=ckanext-scheming
+
+# Replace default path to CKAN core config file with the one on the container
+sed -i -e 's/use = config:.*/use = config:\/srv\/app\/src\/ckan\/test-core.ini/' "$WORKDIR"/test.ini
+
+# Init db and enable required plugins
+paster --plugin=ckan config-tool "$WORKDIR"/test.ini "ckan.plugins = "
+paster --plugin=ckan db init -c "$WORKDIR"/test.ini
+paster --plugin=ckanext-harvest harvester initdb -c "$WORKDIR"/test.ini
+paster --plugin=ckan config-tool "$WORKDIR"/test.ini "ckan.plugins = harvest ckan_harvester geocat_harvester ogdch ogdch_pkg scheming_datasets fluent"

ckanext/geocat/utils/ogdch_map_utils.py

@@ -206,6 +206,7 @@ def map_resource(geocat_resource, issued, modified, rights):
     resource_dict['issued'] = issued
     resource_dict['modified'] = modified
     resource_dict['rights'] = rights
+    resource_dict['license'] = rights
     if geocat_resource.get('format'):
         resource_dict['format'] = geocat_resource['format']
     resource_dict['description'] = geocat_resource.get('description')

ckanext/geocat/utils/xpath_utils.py

@@ -173,7 +173,7 @@ def xpath_get_rights_dict_form_rights_node(node):
             if value_locale:
                 rights_dict[locale.lower()] = _clean_string(value_locale[0])
         return rights_dict
-    except:
+    except Exception:
         return ''
 
 
@@ -376,7 +376,7 @@ def _get_normed_protocol(protocol):
 
 def _clean_string(value):
     try:
-        return re.sub('\s+', ' ', value).strip()
+        return re.sub(r'\s+', ' ', value).strip()
     except TypeError:
         return value
 

requirements.txt

@@ -1,5 +1,7 @@
 lxml>=4.6.2
 OWSLib==0.18.0
+pyproj==1.9.6
 python-dateutil==2.8.1
-pyyaml==5.4
+# TODO: Revert to 5.4 once https://github.com/yaml/pyyaml/issues/724 is fixed
+pyyaml==5.3.1
 rdflib==5.0.0