Skip to content

Commit

Permalink
Update ckanext-spatial
Browse files Browse the repository at this point in the history
Add Spatial - v2.1.1 version with pyproj patch.
  • Loading branch information
mjanez committed Feb 12, 2024
1 parent 445e2f9 commit 7e5e4e8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
6 changes: 3 additions & 3 deletions ckan/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ###
Expand All @@ -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 && \
Expand Down
6 changes: 2 additions & 4 deletions ckan/req_fixes/ckanext-spatial_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
geojson==3.0.1

0 comments on commit 7e5e4e8

Please sign in to comment.