[fc] Repository: Products.contentmigration

Branch: refs/heads/master Date: 2021-10-05T21:01:05+02:00 Author: Maurits van Rees (mauritsvanrees) <[email protected]> Commit: plone/Products.contentmigration@d8632da Prevent installation on Py 3, where Archetypes does not work. See plone/Products.CMFPlone#3330 Files changed: A news/3330.bugfix M setup.cfg M setup.py Repository: Products.contentmigration Branch: refs/heads/master Date: 2021-10-07T12:26:32+02:00 Author: Jens W. Klein (jensens) <[email protected]> Commit: plone/Products.contentmigration@6219103 Merge pull request #26 from plone/prevent-installation-on-py3 Prevent installation on Py 3, where Archetypes does not work. Files changed: A news/3330.bugfix M setup.cfg M setup.py
plone · Oct 7, 2021 · 2cc8660 · 2cc8660
1 parent e9287b3
commit 2cc8660
Showing 1 changed file with 21 additions and 17 deletions.
diff --git a/last_commit.txt b/last_commit.txt
@@ -1,34 +1,38 @@
-Repository: plone.tiles
+Repository: Products.contentmigration
 
 
 Branch: refs/heads/master
-Date: 2021-10-06T18:38:03+02:00
-Author: Johannes Raggam (thet) <[email protected]>
-Commit: https://github.com/plone/plone.tiles/commit/ebe64d293f4ae01574519974ca7cdc621156d132
+Date: 2021-10-05T21:01:05+02:00
+Author: Maurits van Rees (mauritsvanrees) <[email protected]>
+Commit: https://github.com/plone/Products.contentmigration/commit/d8632da394db8fd036fc15f0b2d158506e379ed8
 
-Fix incorrectly set condition for plone.protect.
+Prevent installation on Py 3, where Archetypes does not work.
+
+See https://github.com/plone/Products.CMFPlone/issues/3330
 
 Files changed:
-A news/33.bugfix
-M plone/tiles/configure.zcml
+A news/3330.bugfix
+M setup.cfg
+M setup.py
 
-b'diff --git a/news/33.bugfix b/news/33.bugfix\nnew file mode 100644\nindex 0000000..627b0b2\n--- /dev/null\n+++ b/news/33.bugfix\n@@ -0,0 +1,2 @@\n+Fix incorrectly set condition for plone.protect.\n+[thet]\ndiff --git a/plone/tiles/configure.zcml b/plone/tiles/configure.zcml\nindex 44562a4..f53a53c 100644\n--- a/plone/tiles/configure.zcml\n+++ b/plone/tiles/configure.zcml\n@@ -61,40 +61,40 @@\n         permission="zope.Public"\n         />\n \n-    <adapter\n-        name="plone.protect.autocsrf"\n-        provides="plone.transformchain.interfaces.ITransform"\n-        for=".esi.ESIHead *"\n-        factory=".esi.ESIProtectTransform"\n-        zcml:condition="installed plone.transformchain"\n-        />\n-\n-    <adapter\n-        name="plone.protect.autocsrf"\n-        provides="plone.transformchain.interfaces.ITransform"\n-        for=".esi.ESIBody *"\n-        factory=".esi.ESIProtectTransform"\n-        zcml:condition="installed plone.transformchain"\n-        />\n-\n-    <adapter\n-        name="plone.protect.autocsrf"\n-        provides="plone.transformchain.interfaces.ITransform"\n-        for=".tile.Tile *"\n-        factory=".tile.TileProtectTransform"\n-        zcml:condition="installed plone.transformchain"\n-        />\n-\n     <configure zcml:condition="installed plone.protect">\n-      <adapter\n-        name="plone.tiles.tiletheming"\n-        provides="plone.transformchain.interfaces.ITransform"\n-        for=".tile.Tile *"\n-        factory=".tile.TileThemingTransform"\n-        zcml:condition="installed plone.transformchain"\n-      />\n+        <adapter\n+            name="plone.protect.autocsrf"\n+            provides="plone.transformchain.interfaces.ITransform"\n+            for=".esi.ESIHead *"\n+            factory=".esi.ESIProtectTransform"\n+            zcml:condition="installed plone.transformchain"\n+            />\n+\n+        <adapter\n+            name="plone.protect.autocsrf"\n+            provides="plone.transformchain.interfaces.ITransform"\n+            for=".esi.ESIBody *"\n+            factory=".esi.ESIProtectTransform"\n+            zcml:condition="installed plone.transformchain"\n+            />\n+\n+        <adapter\n+            name="plone.protect.autocsrf"\n+            provides="plone.transformchain.interfaces.ITransform"\n+            for=".tile.Tile *"\n+            factory=".tile.TileProtectTransform"\n+            zcml:condition="installed plone.transformchain"\n+            />\n     </configure>\n \n+    <adapter\n+      name="plone.tiles.tiletheming"\n+      provides="plone.transformchain.interfaces.ITransform"\n+      for=".tile.Tile *"\n+      factory=".tile.TileThemingTransform"\n+      zcml:condition="installed plone.transformchain"\n+    />\n+\n     <!-- Field Type converters -->\n     <adapter for="zope.schema.interfaces.IBytesLine"\n              factory="plone.tiles.fieldtypeconverters.NoConverter"\n'
+b'diff --git a/news/3330.bugfix b/news/3330.bugfix\nnew file mode 100644\nindex 0000000..a23a636\n--- /dev/null\n+++ b/news/3330.bugfix\n@@ -0,0 +1,2 @@\n+Prevent installation on Python 3, as we know Archetypes does not work there.\n+[maurits]\ndiff --git a/setup.cfg b/setup.cfg\nindex aecfa92..7bf855e 100644\n--- a/setup.cfg\n+++ b/setup.cfg\n@@ -3,7 +3,6 @@ ignore =\n     *.cfg\n     bootstrap.py\n \n-\n-\n [bdist_wheel]\n-universal = 1\n+# Py2 only\n+universal = 0\ndiff --git a/setup.py b/setup.py\nindex 3efe62b..cefd1e8 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -1,5 +1,12 @@\n from setuptools import setup, find_packages\n \n+import sys\n+\n+\n+if sys.version_info[0] != 2:\n+    # Prevent creating or installing a distribution with Python 3.\n+    raise ValueError("Products.contentmigration is based on Archetypes, which is Python 2 only.")\n+\n version = \'2.2.2.dev0\'\n \n setup(\n@@ -12,14 +19,10 @@\n         "Development Status :: 5 - Production/Stable",\n         "Framework :: Plone",\n         "Framework :: Plone :: 5.2",\n-        "Framework :: Plone :: 6.0",\n         "Framework :: Plone :: Core",\n         "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)",\n         "Programming Language :: Python",\n         "Programming Language :: Python :: 2.7",\n-        "Programming Language :: Python :: 3.6",\n-        "Programming Language :: Python :: 3.7",\n-        "Programming Language :: Python :: 3.8",\n     ],\n     keywords=\'Plone Archetypes ATContentTypes\',\n     author=\'Martin Aspeli (and others)\',\n@@ -30,6 +33,7 @@\n     namespace_packages=[\'Products\'],\n     include_package_data=True,\n     zip_safe=False,\n+    python_requires=\'==2.7.*\',\n     extras_require=dict(\n         test=[\n             \'archetypes.schemaextender\',\n'
 
-Repository: plone.tiles
+Repository: Products.contentmigration
 
 
 Branch: refs/heads/master
-Date: 2021-10-06T23:13:08+02:00
-Author: Johannes Raggam (thet) <[email protected]>
-Commit: https://github.com/plone/plone.tiles/commit/2ed1d0c3064772c4cbc7563f5031ee3258b5ea81
+Date: 2021-10-07T12:26:32+02:00
+Author: Jens W. Klein (jensens) <[email protected]>
+Commit: https://github.com/plone/Products.contentmigration/commit/621910374a454c0820c3ef0199ffc34dbd1d6173
 
-Merge pull request #33 from plone/thet-fix-condition-plone-protect
+Merge pull request #26 from plone/prevent-installation-on-py3
 
-Fix incorrectly set condition for plone.protect.
+Prevent installation on Py 3, where Archetypes does not work.
 
 Files changed:
-A news/33.bugfix
-M plone/tiles/configure.zcml
+A news/3330.bugfix
+M setup.cfg
+M setup.py
 
-b'diff --git a/news/33.bugfix b/news/33.bugfix\nnew file mode 100644\nindex 0000000..627b0b2\n--- /dev/null\n+++ b/news/33.bugfix\n@@ -0,0 +1,2 @@\n+Fix incorrectly set condition for plone.protect.\n+[thet]\ndiff --git a/plone/tiles/configure.zcml b/plone/tiles/configure.zcml\nindex 44562a4..f53a53c 100644\n--- a/plone/tiles/configure.zcml\n+++ b/plone/tiles/configure.zcml\n@@ -61,40 +61,40 @@\n         permission="zope.Public"\n         />\n \n-    <adapter\n-        name="plone.protect.autocsrf"\n-        provides="plone.transformchain.interfaces.ITransform"\n-        for=".esi.ESIHead *"\n-        factory=".esi.ESIProtectTransform"\n-        zcml:condition="installed plone.transformchain"\n-        />\n-\n-    <adapter\n-        name="plone.protect.autocsrf"\n-        provides="plone.transformchain.interfaces.ITransform"\n-        for=".esi.ESIBody *"\n-        factory=".esi.ESIProtectTransform"\n-        zcml:condition="installed plone.transformchain"\n-        />\n-\n-    <adapter\n-        name="plone.protect.autocsrf"\n-        provides="plone.transformchain.interfaces.ITransform"\n-        for=".tile.Tile *"\n-        factory=".tile.TileProtectTransform"\n-        zcml:condition="installed plone.transformchain"\n-        />\n-\n     <configure zcml:condition="installed plone.protect">\n-      <adapter\n-        name="plone.tiles.tiletheming"\n-        provides="plone.transformchain.interfaces.ITransform"\n-        for=".tile.Tile *"\n-        factory=".tile.TileThemingTransform"\n-        zcml:condition="installed plone.transformchain"\n-      />\n+        <adapter\n+            name="plone.protect.autocsrf"\n+            provides="plone.transformchain.interfaces.ITransform"\n+            for=".esi.ESIHead *"\n+            factory=".esi.ESIProtectTransform"\n+            zcml:condition="installed plone.transformchain"\n+            />\n+\n+        <adapter\n+            name="plone.protect.autocsrf"\n+            provides="plone.transformchain.interfaces.ITransform"\n+            for=".esi.ESIBody *"\n+            factory=".esi.ESIProtectTransform"\n+            zcml:condition="installed plone.transformchain"\n+            />\n+\n+        <adapter\n+            name="plone.protect.autocsrf"\n+            provides="plone.transformchain.interfaces.ITransform"\n+            for=".tile.Tile *"\n+            factory=".tile.TileProtectTransform"\n+            zcml:condition="installed plone.transformchain"\n+            />\n     </configure>\n \n+    <adapter\n+      name="plone.tiles.tiletheming"\n+      provides="plone.transformchain.interfaces.ITransform"\n+      for=".tile.Tile *"\n+      factory=".tile.TileThemingTransform"\n+      zcml:condition="installed plone.transformchain"\n+    />\n+\n     <!-- Field Type converters -->\n     <adapter for="zope.schema.interfaces.IBytesLine"\n              factory="plone.tiles.fieldtypeconverters.NoConverter"\n'
+b'diff --git a/news/3330.bugfix b/news/3330.bugfix\nnew file mode 100644\nindex 0000000..a23a636\n--- /dev/null\n+++ b/news/3330.bugfix\n@@ -0,0 +1,2 @@\n+Prevent installation on Python 3, as we know Archetypes does not work there.\n+[maurits]\ndiff --git a/setup.cfg b/setup.cfg\nindex aecfa92..7bf855e 100644\n--- a/setup.cfg\n+++ b/setup.cfg\n@@ -3,7 +3,6 @@ ignore =\n     *.cfg\n     bootstrap.py\n \n-\n-\n [bdist_wheel]\n-universal = 1\n+# Py2 only\n+universal = 0\ndiff --git a/setup.py b/setup.py\nindex 3efe62b..cefd1e8 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -1,5 +1,12 @@\n from setuptools import setup, find_packages\n \n+import sys\n+\n+\n+if sys.version_info[0] != 2:\n+    # Prevent creating or installing a distribution with Python 3.\n+    raise ValueError("Products.contentmigration is based on Archetypes, which is Python 2 only.")\n+\n version = \'2.2.2.dev0\'\n \n setup(\n@@ -12,14 +19,10 @@\n         "Development Status :: 5 - Production/Stable",\n         "Framework :: Plone",\n         "Framework :: Plone :: 5.2",\n-        "Framework :: Plone :: 6.0",\n         "Framework :: Plone :: Core",\n         "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)",\n         "Programming Language :: Python",\n         "Programming Language :: Python :: 2.7",\n-        "Programming Language :: Python :: 3.6",\n-        "Programming Language :: Python :: 3.7",\n-        "Programming Language :: Python :: 3.8",\n     ],\n     keywords=\'Plone Archetypes ATContentTypes\',\n     author=\'Martin Aspeli (and others)\',\n@@ -30,6 +33,7 @@\n     namespace_packages=[\'Products\'],\n     include_package_data=True,\n     zip_safe=False,\n+    python_requires=\'==2.7.*\',\n     extras_require=dict(\n         test=[\n             \'archetypes.schemaextender\',\n'