Merge pull request #5 from eea/develop

Merge #122622
eea · Nov 25, 2020 · e93955a · e93955a
2 parents f8db6eb + 78332d1
commit e93955a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.4 - (2020-11-25)
+---------------------------
+* Change: Added collective.taxonomy dependency in metadata.xml
+  [iulianpetchesi refs #122622]
+
 1.3 - (2020-11-24)
 ---------------------------
 * Change: Added @geodata RestAPI endpoint

diff --git a/eea/geolocation/profiles/default/metadata.xml b/eea/geolocation/profiles/default/metadata.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata>
   <version>1.0</version>
+  <dependencies>
+    <dependency>profile-collective.taxonomy:default</dependency>
+  </dependencies>
 </metadata>
diff --git a/eea/geolocation/tests/base.py b/eea/geolocation/tests/base.py
@@ -16,12 +16,16 @@ def setUpZope(self, app, configurationContext):
         """ Setup Zope
         """
         import eea.geolocation
+        import collective.taxonomy
+        self.loadZCML(package=collective.taxonomy)
         self.loadZCML(package=eea.geolocation)
+        z2.installProduct(app, 'collective.taxonomy')
         z2.installProduct(app, 'eea.geolocation')
 
     def setUpPloneSite(self, portal):
         """ Setup Plone
         """
+        applyProfile(portal, 'collective.taxonomy:default')
         applyProfile(portal, 'eea.geolocation:default')
 
         # Default workflow

diff --git a/eea/geolocation/version.txt b/eea/geolocation/version.txt
@@ -1 +1 @@
-1.3
+1.4