[fc] Repository: plone.app.upgrade

Branch: refs/heads/master Date: 2015-09-30T16:24:38+02:00 Author: Patrick Gerken (do3cc) <do3cc@patrick-gerken.de> Commit: plone/plone.app.upgrade@0ab47d6 Handle case of environment with CMFPlacefulworkflow Files changed: M plone/app/upgrade/__init__.py Repository: plone.app.upgrade Branch: refs/heads/master Date: 2015-09-30T16:24:38+02:00 Author: Patrick Gerken (do3cc) <do3cc@patrick-gerken.de> Commit: plone/plone.app.upgrade@5318342 Revert "add Products.CMFPlacefulWorkflow as dep as __init__ requires this" This reverts commit 0da7c6cc10279bcbc7b478a349b874231ec0c729. Files changed: M setup.py Repository: plone.app.upgrade Branch: refs/heads/master Date: 2015-10-01T10:54:17+02:00 Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> Commit: plone/plone.app.upgrade@f917b60 Merge pull request #34 from plone/do3cc_bla Alternative solution to the dependency issue WARNING below Files changed: M plone/app/upgrade/__init__.py M setup.py
plone · Oct 1, 2015 · c6c4c0a · c6c4c0a
1 parent 593f95e
commit c6c4c0a
Showing 1 changed file with 97 additions and 57 deletions.
diff --git a/last_commit.txt b/last_commit.txt
@@ -2,67 +2,107 @@ Repository: plone.app.upgrade
 
 
 Branch: refs/heads/master
-Date: 2015-09-30T12:56:55+02:00
-Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
-Commit: https://github.com/plone/plone.app.upgrade/commit/9c28d8a474b4a9adbc1133e87149a6b78383d8a8
+Date: 2015-09-30T16:24:38+02:00
+Author: Patrick Gerken (do3cc) <do3cc@patrick-gerken.de>
+Commit: https://github.com/plone/plone.app.upgrade/commit/0ab47d6b4d6914e70574fb0aac12ec933dd51d71
 
-Cleanup the skins tool.
-
-Do this in Plone 4.3.8 and 5.0.1.
-Reuse the upgrade step we did in the Plone 4.0 alphas:
-- Remove directory views for directories missing on the filesystem.
-- Remove no longer existing entries from skin selections.
+Handle case of environment with CMFPlacefulworkflow
 
 Files changed:
-M CHANGES.rst
-M plone/app/upgrade/v43/configure.zcml
-M plone/app/upgrade/v50/configure.zcml
-
-diff --git a/CHANGES.rst b/CHANGES.rst
-index 43d9cdf..76e275a 100644
---- a/CHANGES.rst
-+++ b/CHANGES.rst
-@@ -4,6 +4,9 @@ Changelog
- 1.3.19 (unreleased)
- -------------------
-
-+- Cleanup the skins tool.
-+  [maurits]
-+
- - Cleanup uninstalled products.  Remove uninstalled products from QI
-   and mark their installed profile version as unknown.
-   [maurits]
-diff --git a/plone/app/upgrade/v43/configure.zcml b/plone/app/upgrade/v43/configure.zcml
-index 6d237c8..dc12851 100644
---- a/plone/app/upgrade/v43/configure.zcml
-+++ b/plone/app/upgrade/v43/configure.zcml
-@@ -219,6 +219,11 @@
-            handler="plone.app.upgrade.v43.final.cleanupUninstalledProducts"
-            />
-
-+        <genericsetup:upgradeStep
-+            title="Cleanup the skins tool."
-+            handler="plone.app.upgrade.v40.alphas.cleanUpSkinsTool"
-+            />
-+
-     </genericsetup:upgradeSteps>
-
- </configure>
-diff --git a/plone/app/upgrade/v50/configure.zcml b/plone/app/upgrade/v50/configure.zcml
-index ea9357a..f3b5961 100644
---- a/plone/app/upgrade/v50/configure.zcml
-+++ b/plone/app/upgrade/v50/configure.zcml
-@@ -254,6 +254,11 @@
-            handler="plone.app.upgrade.v43.final.cleanupUninstalledProducts"
-            />
+M plone/app/upgrade/__init__.py
+
+diff --git a/plone/app/upgrade/__init__.py b/plone/app/upgrade/__init__.py
+index 23c5cc0..3815aeb 100644
+--- a/plone/app/upgrade/__init__.py
++++ b/plone/app/upgrade/__init__.py
+@@ -140,7 +140,12 @@ def getNonInstallableProducts(self):
 
-+       <gs:upgradeStep
-+           title="Cleanup the skins tool."
-+           handler="plone.app.upgrade.v40.alphas.cleanUpSkinsTool"
-+           />
-+
-     </gs:upgradeSteps>
+ # To solve the __iro__ problem because CMFPlacefulWorkflow interfaces changed on 1.6.1
+ try:
++    pkg_resources.get_distribution('Products.CMFPlacefulWorkflow')
+     from Products.CMFPlacefulWorkflow.interfaces import portal_placeful_workflow
++except pkg_resources.DistributionNotFound:
++    # No package in this environment requires CMFPlacefulWorkflow,
++    # so no patching necessary
++    pass
+ except:
+     from Products.CMFPlacefulWorkflow import interfaces
+     alias_module('Products.CMFPlacefulWorkflow.interfaces.portal_placeful_workflow', interfaces)
+
+
+Repository: plone.app.upgrade
+
+
+Branch: refs/heads/master
+Date: 2015-09-30T16:24:38+02:00
+Author: Patrick Gerken (do3cc) <do3cc@patrick-gerken.de>
+Commit: https://github.com/plone/plone.app.upgrade/commit/53183422b3a07406a3bfa96346f686e9af4302cd
+
+Revert "add Products.CMFPlacefulWorkflow as dep as __init__ requires this"
+
+This reverts commit 0da7c6cc10279bcbc7b478a349b874231ec0c729.
+
+Files changed:
+M setup.py
+
+diff --git a/setup.py b/setup.py
+index fa23d99..802ca43 100644
+--- a/setup.py
++++ b/setup.py
+@@ -61,7 +61,6 @@
+         'Products.CMFDiffTool',
+         'Products.CMFEditions',
+         'Products.CMFFormController',
+-        'Products.CMFPlacefulWorkflow',
+         'Products.CMFQuickInstallerTool',
+         'Products.CMFUid',
+         'Products.DCWorkflow',
+
+
+Repository: plone.app.upgrade
+
+
+Branch: refs/heads/master
+Date: 2015-10-01T10:54:17+02:00
+Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
+Commit: https://github.com/plone/plone.app.upgrade/commit/f917b60d8c6d8109707b185358aff59e7847a05e
+
+Merge pull request #34 from plone/do3cc_bla
+
+Alternative solution to the dependency issue WARNING below
+
+Files changed:
+M plone/app/upgrade/__init__.py
+M setup.py
+
+diff --git a/plone/app/upgrade/__init__.py b/plone/app/upgrade/__init__.py
+index 23c5cc0..3815aeb 100644
+--- a/plone/app/upgrade/__init__.py
++++ b/plone/app/upgrade/__init__.py
+@@ -140,7 +140,12 @@ def getNonInstallableProducts(self):
 
- </configure>
+ # To solve the __iro__ problem because CMFPlacefulWorkflow interfaces changed on 1.6.1
+ try:
++    pkg_resources.get_distribution('Products.CMFPlacefulWorkflow')
+     from Products.CMFPlacefulWorkflow.interfaces import portal_placeful_workflow
++except pkg_resources.DistributionNotFound:
++    # No package in this environment requires CMFPlacefulWorkflow,
++    # so no patching necessary
++    pass
+ except:
+     from Products.CMFPlacefulWorkflow import interfaces
+     alias_module('Products.CMFPlacefulWorkflow.interfaces.portal_placeful_workflow', interfaces)
+diff --git a/setup.py b/setup.py
+index fa23d99..802ca43 100644
+--- a/setup.py
++++ b/setup.py
+@@ -61,7 +61,6 @@
+         'Products.CMFDiffTool',
+         'Products.CMFEditions',
+         'Products.CMFFormController',
+-        'Products.CMFPlacefulWorkflow',
+         'Products.CMFQuickInstallerTool',
+         'Products.CMFUid',
+         'Products.DCWorkflow',