From 3053b1d6335f9c84693fde74e9c78648eb01521a Mon Sep 17 00:00:00 2001 From: gforcada Date: Tue, 21 Jan 2025 12:53:07 +0100 Subject: [PATCH] [fc] Repository: plone.theme Branch: refs/heads/master Date: 2025-01-20T22:19:34+01:00 Author: Maurits van Rees (mauritsvanrees) Commit: https://github.com/plone/plone.theme/commit/e2bc6a17fedacf6c82edd63ff3a9a04409b6de8f Fix DeprecationWarnings. Files changed: A news/4090.bugfix M plone/theme/README.rst Repository: plone.theme Branch: refs/heads/master Date: 2025-01-21T12:53:07+01:00 Author: Gil Forcada Codinachs (gforcada) Commit: https://github.com/plone/plone.theme/commit/86dd80abce09ae9b75d2faa7a74616697af1c94b Merge pull request #29 from plone/maurits-warnings Fix DeprecationWarnings. Files changed: A news/4090.bugfix M plone/theme/README.rst --- last_commit.txt | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/last_commit.txt b/last_commit.txt index 0d0a8ae91f..21d150295c 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,36 +1,34 @@ -Repository: plone.z3cform +Repository: plone.theme Branch: refs/heads/master -Date: 2025-01-20T22:22:49+01:00 +Date: 2025-01-20T22:19:34+01:00 Author: Maurits van Rees (mauritsvanrees) -Commit: https://github.com/plone/plone.z3cform/commit/031202abaa06bed51c513e3827748804f60631f8 +Commit: https://github.com/plone/plone.theme/commit/e2bc6a17fedacf6c82edd63ff3a9a04409b6de8f Fix DeprecationWarnings. Files changed: A news/4090.bugfix -M setup.py -M src/plone/z3cform/tests.py +M plone/theme/README.rst -b'diff --git a/news/4090.bugfix b/news/4090.bugfix\nnew file mode 100644\nindex 0000000..8528aef\n--- /dev/null\n+++ b/news/4090.bugfix\n@@ -0,0 +1 @@\n+Fix DeprecationWarnings. [maurits]\ndiff --git a/setup.py b/setup.py\nindex 63f4e04..6a2fcf5 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -65,5 +65,5 @@ def description():\n "zope.pagetemplate",\n "Zope",\n ],\n- extras_require={"test": ["persistent", "plone.testing[z2]", "zope.annotation"]},\n+ extras_require={"test": ["persistent", "plone.testing", "zope.annotation"]},\n )\ndiff --git a/src/plone/z3cform/tests.py b/src/plone/z3cform/tests.py\nindex 23d1815..6fc28ac 100644\n--- a/src/plone/z3cform/tests.py\n+++ b/src/plone/z3cform/tests.py\n@@ -1,7 +1,7 @@\n from plone.testing import Layer\n from plone.testing import layered\n-from plone.testing import z2\n from plone.testing import zca\n+from plone.testing import zope\n from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile\n from z3c.form.interfaces import IFormLayer\n from zope import component\n@@ -141,7 +141,7 @@ def getPath(filename):\n \n \n class P3FLayer(Layer):\n- defaultBases = (z2.STARTUP,)\n+ defaultBases = (zope.STARTUP,)\n \n def setUp(self):\n self["configurationContext"] = context = zca.stackConfigurationContext(\n@@ -159,7 +159,7 @@ def tearDown(self):\n \n \n P3F_FIXTURE = P3FLayer()\n-FUNCTIONAL_TESTING = z2.FunctionalTesting(\n+FUNCTIONAL_TESTING = zope.FunctionalTesting(\n bases=(P3F_FIXTURE,), name="plone.z3cform:Functional"\n )\n \n' +b'diff --git a/news/4090.bugfix b/news/4090.bugfix\nnew file mode 100644\nindex 0000000..8528aef\n--- /dev/null\n+++ b/news/4090.bugfix\n@@ -0,0 +1 @@\n+Fix DeprecationWarnings. [maurits]\ndiff --git a/plone/theme/README.rst b/plone/theme/README.rst\nindex 1abe23e..45ee2fa 100644\n--- a/plone/theme/README.rst\n+++ b/plone/theme/README.rst\n@@ -61,7 +61,7 @@ The other outputs "My Theme".\n \n Before we turn on the skin, we will get the default view.\n \n- >>> from plone.testing.z2 import Browser\n+ >>> from plone.testing.zope import Browser\n >>> browser = Browser(layer[\'app\'])\n \n >>> browser.open(layer[\'portal\'].absolute_url() + \'/@@layer-test-view\')\n' -Repository: plone.z3cform +Repository: plone.theme Branch: refs/heads/master -Date: 2025-01-21T12:51:52+01:00 +Date: 2025-01-21T12:53:07+01:00 Author: Gil Forcada Codinachs (gforcada) -Commit: https://github.com/plone/plone.z3cform/commit/52d526cfc7145deac1d7d9cdce05b33e66c3a4d9 +Commit: https://github.com/plone/plone.theme/commit/86dd80abce09ae9b75d2faa7a74616697af1c94b -Merge pull request #28 from plone/maurits-warnings +Merge pull request #29 from plone/maurits-warnings Fix DeprecationWarnings. Files changed: A news/4090.bugfix -M setup.py -M src/plone/z3cform/tests.py +M plone/theme/README.rst -b'diff --git a/news/4090.bugfix b/news/4090.bugfix\nnew file mode 100644\nindex 0000000..8528aef\n--- /dev/null\n+++ b/news/4090.bugfix\n@@ -0,0 +1 @@\n+Fix DeprecationWarnings. [maurits]\ndiff --git a/setup.py b/setup.py\nindex 63f4e04..6a2fcf5 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -65,5 +65,5 @@ def description():\n "zope.pagetemplate",\n "Zope",\n ],\n- extras_require={"test": ["persistent", "plone.testing[z2]", "zope.annotation"]},\n+ extras_require={"test": ["persistent", "plone.testing", "zope.annotation"]},\n )\ndiff --git a/src/plone/z3cform/tests.py b/src/plone/z3cform/tests.py\nindex 23d1815..6fc28ac 100644\n--- a/src/plone/z3cform/tests.py\n+++ b/src/plone/z3cform/tests.py\n@@ -1,7 +1,7 @@\n from plone.testing import Layer\n from plone.testing import layered\n-from plone.testing import z2\n from plone.testing import zca\n+from plone.testing import zope\n from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile\n from z3c.form.interfaces import IFormLayer\n from zope import component\n@@ -141,7 +141,7 @@ def getPath(filename):\n \n \n class P3FLayer(Layer):\n- defaultBases = (z2.STARTUP,)\n+ defaultBases = (zope.STARTUP,)\n \n def setUp(self):\n self["configurationContext"] = context = zca.stackConfigurationContext(\n@@ -159,7 +159,7 @@ def tearDown(self):\n \n \n P3F_FIXTURE = P3FLayer()\n-FUNCTIONAL_TESTING = z2.FunctionalTesting(\n+FUNCTIONAL_TESTING = zope.FunctionalTesting(\n bases=(P3F_FIXTURE,), name="plone.z3cform:Functional"\n )\n \n' +b'diff --git a/news/4090.bugfix b/news/4090.bugfix\nnew file mode 100644\nindex 0000000..8528aef\n--- /dev/null\n+++ b/news/4090.bugfix\n@@ -0,0 +1 @@\n+Fix DeprecationWarnings. [maurits]\ndiff --git a/plone/theme/README.rst b/plone/theme/README.rst\nindex 1abe23e..45ee2fa 100644\n--- a/plone/theme/README.rst\n+++ b/plone/theme/README.rst\n@@ -61,7 +61,7 @@ The other outputs "My Theme".\n \n Before we turn on the skin, we will get the default view.\n \n- >>> from plone.testing.z2 import Browser\n+ >>> from plone.testing.zope import Browser\n >>> browser = Browser(layer[\'app\'])\n \n >>> browser.open(layer[\'portal\'].absolute_url() + \'/@@layer-test-view\')\n'