Merge pull request #732 from vrk-kpa/REKDAT-593_upgrade_ckan

REKDAT-593: Upgrade ckan to 2.10.9

Author: Zharktas

ckan/Dockerfile

@@ -83,7 +83,7 @@ RUN \
   mkdir -p ${DATA_DIR} && \
   # Install CKAN and requirements
   pip install --find-links=/srv/app/wheels -r ${SRC_DIR}/ckan-requirements.txt && \
-  pip install -e git+https://github.com/ckan/ckan.git@ckan-2.10.8#egg=ckan && \
+  pip install -e git+https://github.com/ckan/ckan.git@ckan-2.10.9#egg=ckan && \
   # Configure environment
   addgroup -g 92 ckan && \
   adduser -u 92 -h ${APP_DIR} -H -D -G ckan ckan && \
@@ -231,7 +231,6 @@ COPY ckanext/ckanext-pages/requirements.txt ${EXT_DIR}/ckanext-pages/requirement
 COPY ckanext/ckanext-harvest/requirements.txt ${EXT_DIR}/ckanext-harvest/requirements.txt
 COPY ckanext/ckanext-restricteddata/requirements.txt ${EXT_DIR}/ckanext-restricteddata/requirements.txt
 COPY ckanext/ckanext-matomo/requirements.txt ${EXT_DIR}/ckanext-matomo/requirements.txt
-COPY ckanext/ckanext-sentry/requirements.txt ${EXT_DIR}/ckanext-sentry/requirements.txt
 RUN ${SCRIPT_DIR}/install_extension_requirements.sh
 
 # copy extensions

ckan/ckan-requirements.in

@@ -1,7 +1,7 @@
 # This file defines the used CKAN version and any overrides
 # Compile with pip-compile to produce the ckan-requirements.txt used in build
 
-ckan[requirements]==2.10.8
+ckan[requirements]==2.10.9
 
 # Runtime requirements
 uWSGI==2.0.30

ckan/ckan-requirements.txt

@@ -4,6 +4,8 @@
 #
 #    pip-compile ckan-requirements.in
 #
+--extra-index-url https://alpine-wheels.github.io/index
+
 alembic==1.8.1
     # via ckan
 async-timeout==5.0.1
@@ -27,7 +29,7 @@ charset-normalizer==2.0.12
     #   ckan
     #   requests
 # Removed manually for installing editable separately
-# ckan[requirements]==2.10.8
+# ckan[requirements]==2.10.9
     # via -r ckan-requirements.in
 click==8.1.3
     # via
@@ -142,7 +144,7 @@ redis==4.6.0
     # via
     #   ckan
     #   rq
-requests==2.32.3
+requests==2.32.4
     # via
     #   ckan
     #   pysolr

ckan/ckanext/ckanext-restricteddata/ckanext/restricteddata/helpers.py

@@ -172,7 +172,8 @@ def pages_build_nav_main(*args):
 
     return output
 
-def build_nav_main(*args, pages=False):
+@toolkit.chained_helper
+def build_nav_main(next, *args, pages=False):
     if pages:
         return pages_build_nav_main(*args)
     else:

ckan/ckanext/ckanext-restricteddata/ckanext/restricteddata/plugin.py

@@ -201,7 +201,7 @@ def group_facets(self,
                      facets_dict: OrderedDict[str, Any],
                      group_type: str,
                      package_type: Optional[str]) -> OrderedDict[str, Any]:
-        
+
         facets = self._facets()
         del facets['groups']
         return facets
@@ -247,8 +247,7 @@ def get_auth_functions(self):
         }
 
 
-class RestrictedDataPagesPlugin(plugins.SingletonPlugin, DefaultTranslation):
-    plugins.implements(plugins.ITranslation)
+class RestrictedDataPagesPlugin(plugins.SingletonPlugin):
     plugins.implements(plugins.IConfigurer)
     plugins.implements(IPagesSchema)
     plugins.implements(plugins.ITemplateHelpers)

ckan/ckanext/ckanext-sentry

@@ -1,4 +1,4 @@
-FROM python:3
+FROM python:3.12
 RUN apt update && apt install -y chromium-driver
 WORKDIR /robot
 COPY requirements.txt .

robot/Dockerfile

@@ -15,21 +15,21 @@ Create Minimal Dataset And Resource
     Click Link  link:Lisää tietoaineisto
     Fill Dataset Form With Minimal Test Data
     Submit Primary Form
-    
+
     URL Path Should Be  /dataset/testiaineisto/resource/new
     Fill Resource Form With Minimal Test Data  url=http://example.com/test-resource
     Submit Primary Form
-    
+
     URL Path Should Be  /dataset/testiaineisto
     Page Should Contain  Testiaineiston kuvaus
     Page Should Contain  Teemu Testaaja
     Page Should Contain  teemu.testaaja@example.com
-        
+
     Click Link  http://example.com/test-resource
     Page Should Contain  12345
     Page Should Contain  Testiresurssin käyttöoikeuksien kuvaus
-    
-    
+
+
 Create Dataset With All Fields
     Log In As Test User
     Click Link  link:Tietoaineistot
@@ -118,25 +118,25 @@ Edit Dataset
     Page Should Contain  Tea Testaaja
     Page Should Contain Link  tea.testaaja@example.com
     Page Should Contain Link  https://example.com/service
-    
+
 Remove Dataset
     Log In As Test User
     Click Link  link:Tietoaineistot
     Click Link  link:Lisää tietoaineisto
     Fill Dataset Form With Minimal Test Data
     Submit Primary Form
-    
+
     URL Path Should Be  /dataset/testiaineisto/resource/new
     Fill Resource Form With Minimal Test Data
     Submit Primary Form
-    
+
     URL Path Should Be  /dataset/testiaineisto
     Click Link  Muokkaa tietoaineistoa
 
     Scroll To Form Actions
     Click Link  link:Poista
     Click Suomi.fi Dialog Button  Vahvista
-    URL Path Should Be  /dataset/
+    Wait Until URL Path Is  /dataset/
     Page Should Contain  Ei löytynyt yhtään tietoaineistoa
 
 *** Keywords ***

robot/tests/dataset.robot

@@ -11,14 +11,14 @@ Create Distribution With All Fields
     Click Link  link:Lisää tietoaineisto
     Fill Dataset Form With Minimal Test Data
     Submit Primary Form
-    
+
     URL Path Should Be  /dataset/testiaineisto/resource/new
     Fill Resource Form With Full Test Data
     Submit Primary Form
 
     URL Path Should Be  /dataset/testiaineisto
     Click Link  Testiresurssi
-    
+
     Page Should Contain  Testiresurssi
 
 Display Distribution Metadata
@@ -27,7 +27,7 @@ Display Distribution Metadata
     Click Link  link:Lisää tietoaineisto
     Fill Dataset Form With Minimal Test Data
     Submit Primary Form
-    
+
     URL Path Should Be  /dataset/testiaineisto/resource/new
     Fill Resource Form With Full Test Data  name fi=Testiresurssin nimi
     ...                                     description fi=Testiresurssin kuvausteksti
@@ -44,7 +44,7 @@ Display Distribution Metadata
 
     URL Path Should Be  /dataset/testiaineisto
     Click Link  Testiresurssin nimi
-    
+
     Page Should Contain  Testiresurssin nimi
     Page Should Contain  Testiresurssin kuvausteksti
     Page Should Contain  XHTML
@@ -64,14 +64,14 @@ Edit Distribution
     Click Link  link:Lisää tietoaineisto
     Fill Dataset Form With Minimal Test Data
     Submit Primary Form
-    
+
     URL Path Should Be  /dataset/testiaineisto/resource/new
     Fill Resource Form With Full Test Data
     Submit Primary Form
 
     URL Path Should Be  /dataset/testiaineisto
     Click Link  Testiresurssi
-    Click Link  Muokkaa 
+    Click Link  Muokkaa
 
     Fill Resource Form With Full Test Data  name fi=Testiresurssi (muokattu)
     ...                                     url=http://example.com/modified
@@ -100,27 +100,27 @@ Edit Distribution
     Page Should Contain  2024-05-06
     Page Should Contain  2044-07-08
     Page Should Contain  314
-    
+
 
 Remove Distribution
     Log In As Test User
     Click Link  link:Tietoaineistot
     Click Link  link:Lisää tietoaineisto
     Fill Dataset Form With Minimal Test Data
     Submit Primary Form
-    
+
     URL Path Should Be  /dataset/testiaineisto/resource/new
     Fill Resource Form With Minimal Test Data  url=http://example.com/test-resource
     Submit Primary Form
 
     URL Path Should Be  /dataset/testiaineisto
     Click Link  http://example.com/test-resource
-    Click Link  Muokkaa 
+    Click Link  Muokkaa
 
     Scroll To Form Actions
     Click Link  link:Poista
     Click Suomi.fi Dialog Button  Vahvista
-    URL Path Should Be  /dataset/testiaineisto
+    Wait Until URL Path Is  /dataset/testiaineisto
     Page Should Contain  Tietoaineistoon ei ole lisätty dataa
 
 *** Keywords ***

robot/tests/distribution.robot

@@ -5,7 +5,7 @@ Resource  ../restricteddata.robot
 
 *** Test cases ***
 CKAN version
-  CKAN Version Should Be  2.10.8
+  CKAN Version Should Be  2.10.9
 
 Site title
   Open Chromium