fix: extension does not work without ckanext-spatial

DataShades · Oct 30, 2024 · 7a95120 · 7a95120
1 parent 8c423d2
commit 7a95120
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/ckanext/harvest_basket/harvesters/__init__.py b/ckanext/harvest_basket/harvesters/__init__.py
@@ -5,8 +5,11 @@
 from ckanext.harvest_basket.harvesters.ckan_harvester import CustomCKANHarvester
 from ckanext.harvest_basket.harvesters.ods_harvester import ODSHarvester
 from .dcat import BasketDcatJsonHarvester
-from .csw import BasketCswHarvester
 from .csiro import CsiroHarvester
+try:
+    from .csw import BasketCswHarvester
+except ImportError:
+    pass
 
 __all__ = [
     "DKANHarvester",

diff --git a/ckanext/harvest_basket/harvesters/csiro.py b/ckanext/harvest_basket/harvesters/csiro.py
@@ -7,13 +7,11 @@
 from typing import Any, Iterable
 
 from ckan.lib.munge import munge_name, munge_tag
-from ckan.logic import ValidationError
 import ckan.plugins.toolkit as tk
 
 from ckan import model
 from ckanext.harvest.model import HarvestObject
 from ckanext.harvest.harvesters.ckanharvester import SearchError
-from ckanext.spatial import harvesters
 
 from ckanext.harvest_basket.harvesters.base_harvester import BasketBasicHarvester
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ckanext-harvest-basket"
-version = "1.3.10"
+version = "1.3.11"
 description = "A bunch of custom harvesters for ckanext-harvest"
 authors = [
     {name = "DataShades", email = "datashades@linkdigital.com.au"},

diff --git a/requirements.txt b/requirements.txt
@@ -2,5 +2,4 @@ html2markdown
 geojson~=2.5.0
 jsonschema
 
-ckanext-spatial
 ckanext-transmute~=1.6.0