[fc] Repository: Products.CMFPlone

Branch: refs/heads/6.0.x
Date: 2024-12-17T16:42:36-08:00
Author: Maurits van Rees (mauritsvanrees) <[email protected]>
Commit: plone/Products.CMFPlone@04985e8

Remove unittest.makeSuite for Py 3.13 compatibility [6.0] (#4081)

* unittest.makeSuite got removed in py3.13

* changenote

* Remove unittest.makeSuite from testPropertiesTool.py as well.

---------

Co-authored-by: Peter Mathis &lt;[email protected]&gt;

Files changed:
A news/4066.bugfix
M Products/CMFPlone/exportimport/tests/testControlPanel.py
M Products/CMFPlone/exportimport/tests/testPropertiesTool.py
M Products/CMFPlone/tests/testNavigationView.py
M Products/CMFPlone/tests/testWebDAV.py

last_commit.txt

@@ -1,32 +1,29 @@
-Repository: plone.volto
+Repository: Products.CMFPlone
 
 
-Branch: refs/heads/4.x.x
-Date: 2024-12-17T09:23:14-08:00
-Author: David Glick (davisagli) <[email protected]>
-Commit: https://github.com/plone/plone.volto/commit/861065b4878058755d9028d24e002037962b22b3
+Branch: refs/heads/6.0.x
+Date: 2024-12-17T16:42:36-08:00
+Author: Maurits van Rees (mauritsvanrees) <[email protected]>
+Commit: https://github.com/plone/Products.CMFPlone/commit/04985e8c9fb6c5dcc20f0bbcc2703695f57832bd
 
-Preparing release 4.4.4
+Remove unittest.makeSuite for Py 3.13 compatibility [6.0] (#4081)
 
-Files changed:
-M CHANGES.rst
-M setup.py
-D news/172.bugfix
-
-b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 6fc6765a..15b1ed0d 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -8,6 +8,15 @@ Changelog\n \n .. towncrier release notes start\n \n+4.4.4 (2024-12-17)\n+------------------\n+\n+Bug fixes:\n+\n+\n+- Allow setting `preview_image_link` to an image from a different language root folder. @davisagli (#172)\n+\n+\n 4.4.3 (2024-08-01)\n ------------------\n \ndiff --git a/news/172.bugfix b/news/172.bugfix\ndeleted file mode 100644\nindex c4d213e8..00000000\n--- a/news/172.bugfix\n+++ /dev/null\n@@ -1 +0,0 @@\n-Allow setting `preview_image_link` to an image from a different language root folder. @davisagli\ndiff --git a/setup.py b/setup.py\nindex 49dce306..fd7eb4e1 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -25,7 +25,7 @@ def readfile(name):\n \n setup(\n     name="plone.volto",\n-    version="4.4.4.dev0",\n+    version="4.4.4",\n     description="Volto integration add-on for Plone",\n     long_description=long_description,\n     # Get more from https://pypi.org/classifiers/\n'
-
-Repository: plone.volto
-
-
-Branch: refs/heads/4.x.x
-Date: 2024-12-17T09:23:40-08:00
-Author: David Glick (davisagli) <[email protected]>
-Commit: https://github.com/plone/plone.volto/commit/0363b8d7b0dc93642917353b29abd9b5034bf454
-
-Back to development: 4.4.5
+* unittest.makeSuite got removed in py3.13
+
+* changenote
+
+* Remove unittest.makeSuite from testPropertiesTool.py as well.
+
+---------
+
+Co-authored-by: Peter Mathis &lt;[email protected]&gt;
 
 Files changed:
-M setup.py
+A news/4066.bugfix
+M Products/CMFPlone/exportimport/tests/testControlPanel.py
+M Products/CMFPlone/exportimport/tests/testPropertiesTool.py
+M Products/CMFPlone/tests/testNavigationView.py
+M Products/CMFPlone/tests/testWebDAV.py
 
-b'diff --git a/setup.py b/setup.py\nindex fd7eb4e..66bed59 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -25,7 +25,7 @@ def readfile(name):\n \n setup(\n     name="plone.volto",\n-    version="4.4.4",\n+    version="4.4.5.dev0",\n     description="Volto integration add-on for Plone",\n     long_description=long_description,\n     # Get more from https://pypi.org/classifiers/\n'
+b'diff --git a/Products/CMFPlone/exportimport/tests/testControlPanel.py b/Products/CMFPlone/exportimport/tests/testControlPanel.py\nindex a3582be816..d78b65ac41 100644\n--- a/Products/CMFPlone/exportimport/tests/testControlPanel.py\n+++ b/Products/CMFPlone/exportimport/tests/testControlPanel.py\n@@ -51,9 +51,8 @@ def setUp(self):\n \n \n def test_suite():\n-    from unittest import makeSuite\n-    from unittest import TestSuite\n+    import unittest\n \n-    suite = TestSuite()\n-    suite.addTest(makeSuite(ControlPanelXMLAdapterTests))\n-    return suite\n+    return unittest.TestSuite((\n+        unittest.defaultTestLoader.loadTestsFromTestCase(ControlPanelXMLAdapterTests),\n+    ))\ndiff --git a/Products/CMFPlone/exportimport/tests/testPropertiesTool.py b/Products/CMFPlone/exportimport/tests/testPropertiesTool.py\nindex 48e13f8075..2b4b5930a8 100644\n--- a/Products/CMFPlone/exportimport/tests/testPropertiesTool.py\n+++ b/Products/CMFPlone/exportimport/tests/testPropertiesTool.py\n@@ -86,10 +86,9 @@ def setUp(self):\n \n \n def test_suite():\n-    from unittest import makeSuite\n-    from unittest import TestSuite\n+    import unittest\n \n-    suite = TestSuite()\n-    suite.addTest(makeSuite(PropertySheetXMLAdapterTests))\n-    suite.addTest(makeSuite(PropertiesToolXMLAdapterTests))\n-    return suite\n+    return unittest.TestSuite((\n+        unittest.defaultTestLoader.loadTestsFromTestCase(PropertySheetXMLAdapterTests),\n+        unittest.defaultTestLoader.loadTestsFromTestCase(PropertiesToolXMLAdapterTests),\n+    ))\ndiff --git a/Products/CMFPlone/tests/testNavigationView.py b/Products/CMFPlone/tests/testNavigationView.py\nindex fa8d525a6b..2d9b7d8e63 100644\n--- a/Products/CMFPlone/tests/testNavigationView.py\n+++ b/Products/CMFPlone/tests/testNavigationView.py\n@@ -462,12 +462,11 @@ def testBreadcrumbsFilterByInterface2(self):\n \n \n def test_suite():\n-    from unittest import makeSuite\n-    from unittest import TestSuite\n-\n-    suite = TestSuite()\n-    suite.addTest(makeSuite(TestCatalogPortalTabs))\n-    suite.addTest(makeSuite(TestSiteMap))\n-    suite.addTest(makeSuite(TestCatalogBreadCrumbs))\n-    suite.addTest(makeSuite(TestPhysicalBreadCrumbs))\n-    return suite\n+    import unittest\n+\n+    return unittest.TestSuite((\n+        unittest.defaultTestLoader.loadTestsFromTestCase(TestCatalogPortalTabs),\n+        unittest.defaultTestLoader.loadTestsFromTestCase(TestSiteMap),\n+        unittest.defaultTestLoader.loadTestsFromTestCase(TestCatalogBreadCrumbs),\n+        unittest.defaultTestLoader.loadTestsFromTestCase(TestPhysicalBreadCrumbs),\n+    ))\ndiff --git a/Products/CMFPlone/tests/testWebDAV.py b/Products/CMFPlone/tests/testWebDAV.py\nindex 2105ae4390..4cceb6e48c 100644\n--- a/Products/CMFPlone/tests/testWebDAV.py\n+++ b/Products/CMFPlone/tests/testWebDAV.py\n@@ -486,13 +486,15 @@ def test_propfind_folder_index_html_not_exists(self):\n \n \n def test_suite():\n-    from unittest import makeSuite\n-    from unittest import TestSuite\n+    import unittest\n \n-    suite = TestSuite()\n     if bbb.HAS_ZSERVER:\n-        suite.addTest(makeSuite(TestDAVProperties))\n-        suite.addTest(makeSuite(TestPUTObjects))\n-        suite.addTest(makeSuite(TestPUTIndexHtml))\n-        suite.addTest(makeSuite(TestDAVOperations))\n-    return suite\n+        return unittest.TestSuite((\n+            unittest.defaultTestLoader.loadTestsFromTestCase(TestDAVProperties),\n+            unittest.defaultTestLoader.loadTestsFromTestCase(TestPUTObjects),\n+            unittest.defaultTestLoader.loadTestsFromTestCase(TestPUTIndexHtml),\n+            unittest.defaultTestLoader.loadTestsFromTestCase(TestDAVOperations),\n+        ))\n+\n+    # return empty suite\n+    return unittest.TestSuite()\ndiff --git a/news/4066.bugfix b/news/4066.bugfix\nnew file mode 100644\nindex 0000000000..c584f2342d\n--- /dev/null\n+++ b/news/4066.bugfix\n@@ -0,0 +1,2 @@\n+Fix removed `unittest.makeSuite` in Python 3.13.\n+[petschki, maurits]\n'