Cleanup setup.py

plone · Oct 23, 2016 · 20011ca · 20011ca
1 parent 8066f51
commit 20011ca
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 66 deletions.
diff --git a/plone/app/upgrade/__init__.py b/plone/app/upgrade/__init__.py
@@ -21,16 +21,6 @@ def getNonInstallableProducts(self):
             'plone.app.upgrade.v51',
         ]
 
-# Make sure folks upgrading from Plone 2.1 see a helpful message telling them
-# how to do a two-stage upgrade, instead of a GroupUserFolder error.
-try:
-    from Products.GroupUserFolder.GroupUserFolder import GroupUserFolder
-except ImportError:
-    from plone.app.upgrade import gruf_bbb
-    sys.modules['Products.GroupUserFolder'] = gruf_bbb
-    sys.modules['Products.GroupUserFolder.GroupUserFolder'] = gruf_bbb
-
-
 try:
     from zope.app.cache.interfaces.ram import IRAMCache
 except ImportError:

diff --git a/plone/app/upgrade/configure.zcml b/plone/app/upgrade/configure.zcml
@@ -16,11 +16,4 @@
         name="plone.app.upgrade"
         />
 
-    <browser:page
-        name="index.html"
-        for=".gruf_bbb.UpgradeProcessError"
-        class=".gruf_bbb.UpgradeProcessErrorView"
-        permission="zope.Public"
-        />
-
 </configure>
diff --git a/plone/app/upgrade/gruf_bbb.py b/plone/app/upgrade/gruf_bbb.py
diff --git a/setup.py b/setup.py
@@ -32,54 +32,33 @@
     zip_safe=False,
     extras_require=dict(
         test=[
+            'zope.site',
             'mock',
-            'Products.CMFPlacefulWorkflow',
-            'Products.CMFQuickInstallerTool',
-            'plone.contentrules',
-            'plone.app.i18n',
-            'plone.app.iterate',
-            'plone.app.openid',
-            'plone.app.redirector',
-            'plone.app.viewletmanager',
             'plone.app.testing',
             'plone.app.theming',
         ]
     ),
     install_requires=[
         'setuptools',
-        'borg.localrole',
-        'five.localsitemanager',
         'plone.portlets',
-        'plone.session',
         'plone.app.folder',
-        'plone.app.portlets',
         'transaction',
         'zope.component',
         'zope.interface',
-        'zope.location',
         'zope.ramcache',
-        'zope.site',
         'Acquisition',
         'Products.CMFPlone',
-        'Products.Archetypes',
-        'Products.contentmigration',
         'Products.CMFCore',
-        'Products.CMFDiffTool',
         'Products.CMFEditions',
-        'Products.CMFFormController',
         'Products.CMFQuickInstallerTool',
-        'Products.CMFUid',
-        'Products.DCWorkflow',
         'Products.GenericSetup>=1.8.1',
-        'Products.MimetypesRegistry',
-        # 'Products.PloneLanguageTool',
         'Products.PlonePAS',
         'Products.PluggableAuthService',
-        'Products.PortalTransforms',
-        'Products.ResourceRegistries',
-        'Products.SecureMailHost',  # For migration only, when can we remove this?
         'Products.ZCatalog >= 2.13.4',
         'Zope2',
+        'plone.contentrules',
+        'plone.app.iterate',
+        'plone.app.viewletmanager',
     ],
     entry_points="""
     [z3c.autoinclude.plugin]