diff --git a/ckan/Dockerfile b/ckan/Dockerfile index 8ae18b31..b80a2e76 100644 --- a/ckan/Dockerfile +++ b/ckan/Dockerfile @@ -15,7 +15,7 @@ COPY req_fixes req_fixes ### XLoader - 1.0.1 ### ### Harvester - v1.5.1 ### ### Geoview - v0.0.20 ### -### Spatial - v2.0.0 ### fixed requirements.txt +### Spatial - v2.1.1 ### ### DCAT - v1.2.0-geodcatap (GeoDCAT-AP/NTI-RISP extended version) ### ### Scheming - release-3.0.0 ### ### Resource dictionary - v1.0.1 ### @@ -37,8 +37,8 @@ RUN echo ${TZ} > /etc/timezone && \ echo "ckan/ckanext-geoview" && \ pip3 install --no-cache-dir -e git+https://github.com/ckan/ckanext-geoview.git@v0.0.20#egg=ckanext-geoview && \ echo "ckan/ckanext-spatial" && \ - pip3 install --no-cache-dir -e git+https://github.com/ckan/ckanext-spatial.git@v2.0.0#egg=ckanext-spatial && \ - pip3 install --no-cache-dir -r ${APP_DIR}/req_fixes/ckanext-spatial_requirements.txt && \ + pip3 install --no-cache-dir -e git+https://github.com/ckan/ckanext-spatial.git@v2.1.1#egg=ckanext-spatial && \ + pip3 install --no-cache-dir -r ${APP_DIR}/src/ckanext-spatial/requirements.txt && \ echo "mjanez/ckanext-dcat (GeoDCAT-AP extended version)" && \ pip3 install --no-cache-dir -e git+https://github.com/mjanez/ckanext-dcat.git@v1.2.0-geodcatap#egg=ckanext-dcat && \ pip3 install --no-cache-dir -r ${APP_DIR}/src/ckanext-dcat/requirements.txt && \ diff --git a/ckan/req_fixes/ckanext-spatial_requirements.txt b/ckan/req_fixes/ckanext-spatial_requirements.txt index 0c15f3c0..b86d5173 100644 --- a/ckan/req_fixes/ckanext-spatial_requirements.txt +++ b/ckan/req_fixes/ckanext-spatial_requirements.txt @@ -3,12 +3,10 @@ lxml>=2.3 argparse pyparsing>=2.1.10 requests>=1.1.0 -six - -# requirements pyproj fix: https://github.com/pyproj4/pyproj/issues/1321 +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.1 OWSLib==0.28.1 -geojson==3.0.1 \ No newline at end of file +geojson==3.0.1