[Closes #4415] Upgrade PyCSW version to 2.4.0

GeoNode · May 19, 2019 · d12f8fe · d12f8fe
1 parent 0e2731a
commit d12f8fe
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/geonode/catalogue/backends/pycsw_local.py b/geonode/catalogue/backends/pycsw_local.py
@@ -26,7 +26,7 @@
 from pycsw import server
 from geonode.catalogue.backends.generic import CatalogueBackend as GenericCatalogueBackend
 from geonode.catalogue.backends.generic import METADATA_FORMATS
-from shapely.geometry.base import ReadingError
+from shapely.errors import WKBReadingError, WKTReadingError
 
 true_value = 'true'
 false_value = 'false'
@@ -172,7 +172,7 @@ def _csw_local_dispatch(self, keywords=None, start=0, limit=10, bbox=None, ident
             # https://gist.github.com/ingenieroariel/717bb720a201030e9b3a
             try:
                 response = csw.dispatch()
-            except ReadingError:
+            except (WKBReadingError, WKTReadingError):
                 return []
 
         if isinstance(response, list):  # pycsw 2.0+

diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
 # native dependencies
 Pillow==5.4.1
-lxml==3.6.2 # <=3.8.0 throws pkg_resources.ContextualVersionConflict: (lxml 3.8.0 (/usr/local/lib/python2.7/site-packages), Requirement.parse('lxml==3.6.2'), set(['pycsw']))
+lxml==4.3.3
 psycopg2==2.7.7
 Django==1.11.20
 
@@ -42,9 +42,8 @@ pyopenssl==19.0.0
 # geopython dependencies
 pyproj>=1.9.5,<=1.9.5.1
 OWSLib==0.16.0
-pycsw==2.2.0
-SQLAlchemy==1.3.1 # required by pycsw==2.2.0
-Shapely==1.5.17
+pycsw==2.4.0
+Shapely==1.6.4.post2
 mercantile==1.0.4
 geoip2==2.9.0
 
@@ -94,7 +93,7 @@ jdcal==1.4
 mock<=2.0.0
 python-dateutil==2.8.0
 pytz==2018.9
-requests>=2.20.0
+requests==2.22.0
 simplejson==3.16.0
 timeout-decorator==0.4.1
 

diff --git a/requirements_docs.txt b/requirements_docs.txt
@@ -63,7 +63,7 @@ invoke==1.2.0
 ipython==5.8.0
 jdcal==1.4
 kombu==4.4.0
-lxml==3.6.2
+lxml==4.3.3
 mercantile==1.0.4
 mock==2.0.0
 oauthlib==3.0.1
@@ -75,7 +75,6 @@ poster==0.8.1
 psutil==5.6.1
 psycopg2==2.7.7
 pycountry
-#pycsw==2.2.0
 pyopenssl==19.0.0
 pyproj==1.9.5.1
 pytest==4.3.1
@@ -87,11 +86,9 @@ python-dateutil==2.8.0
 python-memcached==1.59
 pytz==2018.9
 pyyaml>=4.2b1
-requests>=2.20.0
-#Shapely==1.5.17
+requests==2.22.0
 simplejson==3.16.0
 splinter==0.10.0
-# SQLAlchemy is a mandatory dependency of pycsw 2.2.0
 SQLAlchemy==1.3.1
 timeout-decorator==0.4.1
 tqdm==4.31.1