From 54a807a23d299a42bd89d5cd46866a9144489b02 Mon Sep 17 00:00:00 2001 From: mjanez <96422458+mjanez@users.noreply.github.com> Date: Mon, 25 Sep 2023 07:53:45 +0000 Subject: [PATCH] Update plugins - scheming_dcat to v2.0.0 --- ckan/Dockerfile | 8 ++++---- ckan/req_fixes/ckanext-spatial_requirements.txt | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ckan/Dockerfile b/ckan/Dockerfile index f1095d2..66e9b08 100644 --- a/ckan/Dockerfile +++ b/ckan/Dockerfile @@ -12,12 +12,12 @@ COPY req_fixes ${APP_DIR}/req_fixes ### Harvester - v1.5.1 ### ### Geoview - v0.0.20 ### ### Spatial - v2.0.0 ### fixed requirements.txt -### DCAT - v1.2.0-geodcatap (GeoDCAT-AP extended version) ### +### DCAT - v1.2.0-geodcatap (GeoDCAT-AP/NTI-RISP extended version) ### ### Scheming - release-3.0.0 ### ### Resource dictionary - v1.0.1 ### ### Pages - v0.5.2 ### ### PDFView - 0.0.8 ### -### Scheming DCAT - v1.2.0 (GeoDCAT-AP extended version) ### +### Scheming DCAT - v2.0.0 (GeoDCAT-AP/NTI-RISP extended version) ### ### SPARQL Interface - 2.0.1 ### RUN echo ${TZ} > /etc/timezone && \ if ! [ /usr/share/zoneinfo/${TZ} -ef /etc/localtime ]; then cp /usr/share/zoneinfo/${TZ} /etc/localtime ; fi && \ @@ -46,8 +46,8 @@ RUN echo ${TZ} > /etc/timezone && \ echo "ckan/ckanext-pdfview" && \ pip3 install -e git+https://github.com/ckan/ckanext-pdfview.git@0.0.8#egg=ckanext-pdfview && \ echo "mjanez/ckanext-scheming_dcat" && \ - pip3 install -e git+https://github.com/mjanez/ckanext-scheming_dcat.git@v1.2.0#egg=ckanext_scheming_dcat && \ - pip3 install -r https://raw.githubusercontent.com/mjanez/ckanext-scheming_dcat/v1.2.0/requirements.txt + pip3 install -e git+https://github.com/mjanez/ckanext-scheming_dcat.git@v2.0.0#egg=ckanext_scheming_dcat && \ + pip3 install -r https://raw.githubusercontent.com/mjanez/ckanext-scheming_dcat/v2.0.0/requirements.txt # Used to configure the container environment by setting environment variables, creating users, running initialization scripts, .etc COPY docker-entrypoint.d/* /docker-entrypoint.d/ diff --git a/ckan/req_fixes/ckanext-spatial_requirements.txt b/ckan/req_fixes/ckanext-spatial_requirements.txt index 49be23e..0c15f3c 100644 --- a/ckan/req_fixes/ckanext-spatial_requirements.txt +++ b/ckan/req_fixes/ckanext-spatial_requirements.txt @@ -5,9 +5,9 @@ pyparsing>=2.1.10 requests>=1.1.0 six -# requirements pyproj tempfix: https://github.com/pyproj4/pyproj/issues/1321 +# requirements pyproj fix: https://github.com/pyproj4/pyproj/issues/1321 pyproj==2.6.1; python_version < '3.9' -pyproj @ git+https://github.com/pyproj4/pyproj.git@main; python_version >= '3.9' +pyproj==3.6.1; python_version >= '3.9' Shapely==2.0.1 OWSLib==0.28.1