diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 59f3dcc8..1224f3d3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,7 +22,7 @@ jobs: include: - ckan-version: "2.11" ckan-image: "ckan/ckan-dev:2.11-py3.10" - solr-image: "2.10-solr9-spatial" + solr-image: "2.11-solr9-spatial" harvester-version: 'master' - ckan-version: "2.10" ckan-image: "ckan/ckan-dev:2.10-py3.10" diff --git a/ckanext/spatial/util.py b/ckanext/spatial/util.py index fc822d2e..cbc6bd7e 100644 --- a/ckanext/spatial/util.py +++ b/ckanext/spatial/util.py @@ -12,7 +12,6 @@ from pprint import pprint from ckan import model -from ckan.model.package_extra import PackageExtra try: from ckanext.spatial.lib.reports import validation_report diff --git a/requirements.txt b/requirements.txt index 57e1fb80..bd0d1efa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,9 +4,12 @@ argparse pyparsing>=2.1.10 requests>=1.1.0 cython==0.29.36; python_version < '3.9' + pyproj==2.6.1; python_version < '3.9' pyproj==3.6.1; python_version >= '3.9' -Shapely==2.0.4 -OWSLib==0.31.0 +OWSLib==0.31.0; python_version < '3.10' +OWSLib==0.32.0; python_version >= '3.10' + +Shapely==2.0.6 geojson==3.1.0