Merge pull request #665 from plone/pa-discussion-core-addon

do not enable plone.allowdiscussion by default
plone · Sep 2, 2024 · ce8fd19 · ce8fd19
2 parents 9451abf + f00aae7
commit ce8fd19
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 16 deletions.
diff --git a/.meta.toml b/.meta.toml
@@ -8,3 +8,6 @@ commit-id = "a89af8f2"
 [pyproject]
 codespell_ignores = "oder,ist,crate"
 dependencies_ignores = "['ZServer', 'plone.app.event', 'Products.CMFPlone',]"
+
+[tox]
+constraints_file = "https://dist.plone.org/release/6.1-dev/constraints.txt"
diff --git a/news/665.breaking b/news/665.breaking
@@ -0,0 +1,3 @@
+Do not enable plone.allowdiscussion by default, it is a core add-on now.
+This is for Plone 6.1, so is a breaking change.
+[@jensens]
diff --git a/plone/app/contenttypes/profiles/default/types/Collection.xml b/plone/app/contenttypes/profiles/default/types/Collection.xml
@@ -36,7 +36,6 @@
   >
     <element value="plone.namefromtitle" />
     <element value="plone.collection" />
-    <element value="plone.allowdiscussion" />
     <element value="plone.shortname" />
     <element value="plone.excludefromnavigation" />
     <element value="plone.dublincore" />

diff --git a/plone/app/contenttypes/profiles/default/types/Document.xml b/plone/app/contenttypes/profiles/default/types/Document.xml
@@ -35,7 +35,6 @@
             purge="false"
   >
     <element value="plone.namefromtitle" />
-    <element value="plone.allowdiscussion" />
     <element value="plone.excludefromnavigation" />
     <element value="plone.shortname" />
     <element value="plone.dublincore" />

diff --git a/plone/app/contenttypes/profiles/default/types/File.xml b/plone/app/contenttypes/profiles/default/types/File.xml
@@ -38,7 +38,6 @@
     <element value="plone.publication" />
     <element value="plone.ownership" />
     <element value="plone.namefromfilename" />
-    <element value="plone.allowdiscussion" />
     <element value="plone.shortname" />
     <element value="plone.excludefromnavigation" />
     <element value="plone.relateditems" />

diff --git a/plone/app/contenttypes/profiles/default/types/Folder.xml b/plone/app/contenttypes/profiles/default/types/Folder.xml
@@ -36,7 +36,6 @@
   >
     <element value="plone.dublincore" />
     <element value="plone.namefromtitle" />
-    <element value="plone.allowdiscussion" />
     <element value="plone.excludefromnavigation" />
     <element value="plone.shortname" />
     <element value="plone.constraintypes" />

diff --git a/plone/app/contenttypes/profiles/default/types/Image.xml b/plone/app/contenttypes/profiles/default/types/Image.xml
@@ -37,7 +37,6 @@
     <element value="plone.categorization" />
     <element value="plone.publication" />
     <element value="plone.ownership" />
-    <element value="plone.allowdiscussion" />
     <element value="plone.shortname" />
     <element value="plone.namefromfilename" />
     <element value="plone.excludefromnavigation" />

diff --git a/plone/app/contenttypes/profiles/default/types/Link.xml b/plone/app/contenttypes/profiles/default/types/Link.xml
@@ -34,7 +34,6 @@
   <property name="behaviors"
             purge="false"
   >
-    <element value="plone.allowdiscussion" />
     <element value="plone.shortname" />
     <element value="plone.dublincore" />
     <element value="plone.namefromtitle" />

diff --git a/plone/app/contenttypes/profiles/default/types/News_Item.xml b/plone/app/contenttypes/profiles/default/types/News_Item.xml
@@ -37,7 +37,6 @@
     <element value="plone.dublincore" />
     <element value="plone.richtext" />
     <element value="plone.namefromtitle" />
-    <element value="plone.allowdiscussion" />
     <element value="plone.shortname" />
     <element value="plone.excludefromnavigation" />
     <element value="plone.relateditems" />

diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 import os
 
 
-version = "3.0.10.dev0"
+version = "4.0.0.dev0"
 
 
 def read(*rnames):
@@ -24,16 +24,15 @@ def read(*rnames):
         "Development Status :: 5 - Production/Stable",
         "Environment :: Web Environment",
         "Framework :: Plone",
-        "Framework :: Plone :: 6.0",
+        "Framework :: Plone :: 6.1",
         "Framework :: Plone :: Core",
         "Framework :: Zope :: 5",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
     ],
     keywords="plone content types dexterity",
     author="Plone Foundation",
@@ -44,7 +43,7 @@ def read(*rnames):
     namespace_packages=["plone", "plone.app"],
     include_package_data=True,
     zip_safe=False,
-    python_requires=">=3.8",
+    python_requires=">=3.10",
     install_requires=[
         "setuptools",
         "plone.app.contentmenu",

diff --git a/tox.ini b/tox.ini
@@ -108,7 +108,7 @@ set_env =
 ##
 deps =
     zope.testrunner
-    -c https://dist.plone.org/release/6.0-dev/constraints.txt
+    -c https://dist.plone.org/release/6.1-dev/constraints.txt
 
 ##
 # Specify additional deps in .meta.toml:
@@ -152,7 +152,7 @@ set_env =
 deps =
     coverage
     zope.testrunner
-    -c https://dist.plone.org/release/6.0-dev/constraints.txt
+    -c https://dist.plone.org/release/6.1-dev/constraints.txt
 
 commands =
     rfbrowser init
@@ -171,7 +171,7 @@ deps =
     twine
     build
     towncrier
-    -c https://dist.plone.org/release/6.0-dev/constraints.txt
+    -c https://dist.plone.org/release/6.1-dev/constraints.txt
 
 commands =
     # fake version to not have to install the package
@@ -202,7 +202,7 @@ allowlist_externals =
 deps =
     pipdeptree
     pipforester
-    -c https://dist.plone.org/release/6.0-dev/constraints.txt
+    -c https://dist.plone.org/release/6.1-dev/constraints.txt
 
 commands =
     # Generate the full dependency tree