Merge pull request #27 from eea/develop

Drop eea.cache
eea · May 5, 2023 · 5eb6f3e · 5eb6f3e
2 parents 6dd4200 + 16730c7
commit 5eb6f3e
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 18 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -3,7 +3,7 @@ pipeline {
 
   environment {
         GIT_NAME = "eea.kitkat"
-        SONARQUBE_TAGS = "www.eea.europa.eu"
+        SONARQUBE_TAGS = "www.eea.europa.eu,www.eea.europa.eu-en,demo-www.eea.europa.eu,climate-advisory-board.europa.eu"
     }
 
   stages {

diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+5.0 - (2023-05-05)
+---------------------------
+* Task: Remove eea.cache dependency from eea.kitkat
+  [iulianpetchesi refs #251471]
+
 4.7 - (2023-01-31)
 ---------------------------
 * Task: Add endpoint in order to get the captcha key from registry

diff --git a/eea/kitkat/configure.zcml b/eea/kitkat/configure.zcml
@@ -9,7 +9,6 @@
   <include package="eea.api.layout" />
   <include package="eea.api.taxonomy" />
   <include package="eea.banner" />
-  <include package="eea.cache" />
   <include package="eea.geolocation" />
   <include package="eea.coremetadata" />
   <include package="eea.sentry" />

diff --git a/eea/kitkat/profiles.zcml b/eea/kitkat/profiles.zcml
@@ -33,6 +33,14 @@
       post_handler=".setuphandlers.uninstall"
       />
 
+  <genericsetup:registerProfile
+      name="kitkat_50"
+      title="Upgrade profile for eea.kitkat 5.0"
+      description=""
+      directory="profiles/upgrades/to_50"
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      />
+
   <utility
       factory=".setuphandlers.HiddenProfiles"
       name="eea.kitkat-hiddenprofiles"

diff --git a/eea/kitkat/profiles/default/metadata.xml b/eea/kitkat/profiles/default/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata>
-  <version>4.2</version>
+  <version>5.0</version>
   <dependencies>
     <dependency>profile-collective.taxonomy:default</dependency>
     <dependency>profile-eea.api.layout:default</dependency>
     <dependency>profile-eea.api.taxonomy:default</dependency>
     <dependency>profile-eea.banner:default</dependency>
     <dependency>profile-eea.coremetadata:default</dependency>
-    <dependency>profile-eea.cache:default</dependency>
     <dependency>profile-eea.geolocation:default</dependency>
     <dependency>profile-eea.sentry:default</dependency>
     <dependency>profile-eea.volto.policy:default</dependency>

diff --git a/eea/kitkat/profiles/upgrades/to_50/actions.xml b/eea/kitkat/profiles/upgrades/to_50/actions.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<object name="portal_actions">
+ <action-provider name="portal_actions"/>
+ <object name="object">
+   <object name="eea.cache" remove="True" />
+ </object>
+</object>
diff --git a/eea/kitkat/profiles/upgrades/to_50/browserlayer.xml b/eea/kitkat/profiles/upgrades/to_50/browserlayer.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<layers>
+  <layer name="eea.cache.layer" remove="true" />
+</layers>
diff --git a/eea/kitkat/upgrades/configure.zcml b/eea/kitkat/upgrades/configure.zcml
@@ -17,18 +17,6 @@
 
   <genericsetup:upgradeSteps
     source="1.0"
-    destination="1.5"
-    profile="eea.kitkat:default">
-
-    <genericsetup:upgradeDepends
-       title="Install eea.cache"
-       import_profile="eea.cache:default"
-      />
-
-  </genericsetup:upgradeSteps>
-
-  <genericsetup:upgradeSteps
-    source="1.5"
     destination="1.6"
     profile="eea.kitkat:default">
 
@@ -75,4 +63,16 @@
 
   </genericsetup:upgradeSteps>
 
+  <genericsetup:upgradeSteps
+    source="4.2"
+    destination="5.0"
+    profile="eea.kitkat:default">
+
+    <genericsetup:upgradeDepends
+      title="Remove eea.cache"
+      import_profile="eea.kitkat:kitkat_50"
+      />
+
+  </genericsetup:upgradeSteps>
+
 </configure>
diff --git a/eea/kitkat/version.txt b/eea/kitkat/version.txt
@@ -1 +1 @@
-4.7
+5.0
diff --git a/setup.py b/setup.py
@@ -40,7 +40,6 @@
     include_package_data=True,
     zip_safe=False,
         install_requires=[
-            'eea.cache',
             'eea.banner',
             'eea.zotero',
             'eea.api.layout',