Merge pull request #664 from plone/remove_ploneappevent

Remove plone.app.event from dependencies

news/663.bugfix

@@ -0,0 +1,2 @@
+Remove the unused dependency plone.app.event
+[@folix-01]

plone/app/contenttypes/configure.zcml

@@ -35,7 +35,10 @@
   <include package="plone.namedfile" />
   <include package="plone.app.contentmenu" />
   <include package="plone.app.dexterity" />
-  <include package="plone.app.event" />
+  <include
+      package="plone.app.event"
+      zcml:condition="installed plone.app.event"
+      />
   <include package="plone.app.linkintegrity" />
   <include package="plone.app.lockingbehavior" />
   <include package="plone.app.querystring" />

plone/app/contenttypes/profiles/default/metadata.xml

@@ -3,7 +3,6 @@
   <version>3000</version>
   <dependencies>
     <dependency>profile-plone.app.dexterity:default</dependency>
-    <dependency>profile-plone.app.event:default</dependency>
     <dependency>profile-plone.app.querystring:default</dependency>
     <dependency>profile-plone.app.relationfield:default</dependency>
     <dependency>profile-plone.app.versioningbehavior:default</dependency>

plone/app/contenttypes/setuphandlers.py

@@ -5,6 +5,7 @@
 from plone.app.textfield.value import RichTextValue
 from plone.base.interfaces import INonInstallable
 from plone.base.interfaces.constrains import ISelectableConstrainTypes
+from plone.base.utils import get_installer
 from plone.base.utils import unrestricted_construct_instance
 from plone.dexterity.fti import IDexterityFTI
 from plone.dexterity.utils import createContent
@@ -24,6 +25,15 @@
 from zope.i18n.locales.provider import LoadLocaleError
 from zope.interface import implementer
 
+import pkg_resources
+
+
+try:
+    pkg_resources.get_distribution("plone.app.event")
+    HAS_EVENT = True
+except pkg_resources.DistributionNotFound:
+    HAS_EVENT = False
+
 
 @implementer(INonInstallable)
 class HiddenProfiles:
@@ -340,7 +350,10 @@ def import_content(context):
     target_language, is_combined_language, locale = _get_locales_info(portal)
     create_frontpage(portal, target_language)
     create_news_topic(portal, target_language)
-    create_events_topic(portal, target_language)
+
+    if HAS_EVENT:
+        create_events_topic(portal, target_language)
+
     configure_members_folder(portal, target_language)
 
 
@@ -349,3 +362,8 @@ def setup_various(context):
     target_language, is_combined_language, locale = _get_locales_info(portal)
     _setup_calendar(portal, locale)
     _setup_visible_ids(portal, target_language, locale)
+
+    # install explicitly the plone.app.event
+    if HAS_EVENT:
+        installer = get_installer(portal)
+        installer.install_product("plone.app.event")

plone/app/contenttypes/testing.py

@@ -1,6 +1,5 @@
 from plone.app.contenttypes.interfaces import IPloneAppContenttypesLayer
 from plone.app.contenttypes.tests.robot.variables import TEST_FOLDER_ID
-from plone.app.event.testing import PAEvent_FIXTURE
 from plone.app.robotframework.testing import REMOTE_LIBRARY_BUNDLE_FIXTURE
 from plone.app.testing import FunctionalTesting
 from plone.app.testing import IntegrationTesting
@@ -23,18 +22,12 @@ def set_browserlayer(request):
 
 
 class PloneAppContenttypes(PloneSandboxLayer):
-    defaultBases = (
-        PAEvent_FIXTURE,
-        PLONE_FIXTURE,
-    )
+    defaultBases = (PLONE_FIXTURE,)
 
     def setUpZope(self, app, configurationContext):
         import plone.app.contenttypes
 
         self.loadZCML(package=plone.app.contenttypes)
-        import plone.app.event.dx
-
-        self.loadZCML(package=plone.app.event.dx)
 
     def setUpPloneSite(self, portal):
         portal.portal_workflow.setDefaultChain("simple_publication_workflow")
@@ -43,7 +36,7 @@ def setUpPloneSite(self, portal):
 class PloneAppContenttypesRobot(PloneAppContenttypes):
     """Same as the default but with a added folder 'robot-test-folder'."""
 
-    defaultBases = (PAEvent_FIXTURE, REMOTE_LIBRARY_BUNDLE_FIXTURE)
+    defaultBases = (REMOTE_LIBRARY_BUNDLE_FIXTURE,)
 
     def setUpPloneSite(self, portal):
         portal.acl_users.userFolderAddUser(

setup.py

@@ -48,7 +48,6 @@ def read(*rnames):
     install_requires=[
         "setuptools",
         "plone.app.contentmenu",
-        "plone.app.event >= 2.0",
         "plone.app.dexterity >= 2.0.7",  # has a fix for INameFromFilename
         "plone.app.linkintegrity",
         "plone.app.querystring >= 1.2.2",  # custom_query support