completely remove eea.api.taxonomy deps

RedTurtle · Nov 29, 2024 · 4f58c90 · 4f58c90
1 parent 0526485
commit 4f58c90
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 7 deletions.
diff --git a/setup.py b/setup.py
@@ -65,10 +65,9 @@
         "redturtle.bandi",
         "z3c.unconfigure",
         "plone.restapi",
-        "collective.taxonomy",
+        "collective.taxonomy>=3.1",
         "openpyxl",
         "collective.volto.enhancedlinks",
-        "eea.api.taxonomy",  # BBB to be removed. Remove also the unconfigure in overrides.zcml
     ],
     extras_require={
         "test": [

diff --git a/src/design/plone/contenttypes/configure.zcml b/src/design/plone/contenttypes/configure.zcml
@@ -65,6 +65,13 @@
       directory="profiles/fix_syndication"
       />
 
+  <genericsetup:registerProfile
+      name="remove_eea_api_taxonomy"
+      title="Uninstall eea.api.taxonomy"
+      description=""
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      directory="profiles/remove_eea_api_taxonomy"
+      />
   <utility
       factory=".setuphandlers.HiddenProfiles"
       name="design.plone.contenttypes-hiddenprofiles"

diff --git a/src/design/plone/contenttypes/overrides.zcml b/src/design/plone/contenttypes/overrides.zcml
@@ -24,9 +24,6 @@
         name="SearchableText"
         />
 
-    <!-- BBB To be removed when we remove eea.api.taxonomy -->
-    <adapter factory="eea.api.taxonomy.restapi.serializer.TaxonomySerializer" />
-
   </unconfigure>
 
 </configure>
diff --git a/src/design/plone/contenttypes/profiles/default/metadata.xml b/src/design/plone/contenttypes/profiles/default/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metadata>
-  <version>7308</version>
+  <version>7309</version>
   <dependencies>
     <dependency>profile-redturtle.bandi:default</dependency>
     <dependency>profile-collective.venue:default</dependency>

diff --git a/src/design/plone/contenttypes/profiles/remove_eea_api_taxonomy/browserlayer.xml b/src/design/plone/contenttypes/profiles/remove_eea_api_taxonomy/browserlayer.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layers>
+  <layer name="eea.api.taxonomy" remove="true" />
+</layers>
diff --git a/src/design/plone/contenttypes/upgrades/to_730x.py b/src/design/plone/contenttypes/upgrades/to_730x.py
@@ -162,5 +162,7 @@ def to_7308(context):
 
 def to_7309(context):
     ps = api.portal.get_tool(name="portal_setup")
-    ps.runAllImportStepsFromProfile("profile-eea.api.taxonomy:uninstall")
+    ps.runAllImportStepsFromProfile(
+        "profile-design.plone.contenttypes:remove_eea_api_taxonomy"
+    )
     ps.unsetLastVersionForProfile("eea.api.taxonomy:default")
diff --git a/test-6.0.x.cfg b/test-6.0.x.cfg
@@ -6,3 +6,4 @@ extends =
     base.cfg
 
 [versions]
+collective.taxonomy =
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,3 +6,4 @@ extends =
		base.cfg

		[versions]
		collective.taxonomy =