Skip to content

Commit

Permalink
[fc] Repository: plone.restapi
Browse files Browse the repository at this point in the history 
Branch: refs/heads/main
Date: 2025-01-21T18:54:28-08:00
Author: David Glick (davisagli) <david@glicksoftware.com>
Commit: plone/plone.restapi@b8f1594

Update Plone test versions, and pin twine (#1865)

* Update Plone test versions, and pin twine

* Avoid overriding version pins

* Remove Python 3.8 from the test matrix for Plone 6.0, where it is no longer supported

* update test output for new minor Plone version

Files changed:
A news/1685.internal
M .github/workflows/tests.yml
M plone-6.0.x-python3.8.cfg
M plone-6.0.x.cfg
M plone-6.1.x.cfg
M requirements-6.0.txt
M requirements-6.1.txt
M src/plone/restapi/tests/http-examples/registry_get_list.resp
M src/plone/restapi/tests/http-examples/site_get.resp
  • Loading branch information
@davisagli
davisagli committed Jan 22, 2025
1 parent 4e00e11 commit 64b6a88
Showing 1 changed file with 23 additions and 30 deletions.
53 changes: 23 additions & 30 deletions last_commit.txt
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,31 @@
Repository: plone.portlets
Repository: plone.restapi


Branch: refs/heads/master
Date: 2025-01-20T21:34:55+01:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: https://github.com/plone/plone.portlets/commit/822e037981d562378d1ba84f1caa888f61749b5d

Fix DeprecationWarnings.

Files changed:
A news/4090.bugfix
M plone/portlets/assignable.py
M plone/portlets/settings.py
M plone/portlets/storage.py

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/portlets/assignable.py b/plone/portlets/assignable.py\nindex 049ac6d..1d1dc6f 100644\n--- a/plone/portlets/assignable.py\n+++ b/plone/portlets/assignable.py\n@@ -1,5 +1,5 @@\n from BTrees.OOBTree import OOBTree\n-from persistent.dict import PersistentDict\n+from persistent.mapping import PersistentMapping\n from plone.portlets.constants import CONTEXT_ASSIGNMENT_KEY\n from plone.portlets.constants import CONTEXT_BLACKLIST_STATUS_KEY\n from plone.portlets.constants import CONTEXT_CATEGORY\n@@ -68,13 +68,13 @@ def _getBlacklist(self, create=False):\n local = annotations.get(CONTEXT_BLACKLIST_STATUS_KEY, None)\n if local is None:\n if create:\n- local = annotations[CONTEXT_BLACKLIST_STATUS_KEY] = PersistentDict()\n+ local = annotations[CONTEXT_BLACKLIST_STATUS_KEY] = PersistentMapping()\n else:\n return None\n blacklist = local.get(self.manager.__name__, None)\n if blacklist is None:\n if create:\n- blacklist = local[self.manager.__name__] = PersistentDict()\n+ blacklist = local[self.manager.__name__] = PersistentMapping()\n else:\n return None\n return blacklist\ndiff --git a/plone/portlets/settings.py b/plone/portlets/settings.py\nindex dc5456f..a06f58b 100644\n--- a/plone/portlets/settings.py\n+++ b/plone/portlets/settings.py\n@@ -1,4 +1,4 @@\n-from persistent.dict import PersistentDict\n+from persistent.mapping import PersistentMapping\n from plone.portlets.constants import ASSIGNMENT_SETTINGS_KEY\n from plone.portlets.interfaces import IPortletAssignment\n from plone.portlets.interfaces import IPortletAssignmentSettings\n@@ -12,7 +12,7 @@\n @implementer(IPortletAssignmentSettings)\n class PortletAssignmentSettings(Contained):\n def __init__(self):\n- self.data = PersistentDict()\n+ self.data = PersistentMapping()\n \n def __setitem__(self, name, value):\n self.data[name] = value\ndiff --git a/plone/portlets/storage.py b/plone/portlets/storage.py\nindex e2c58ca..334d973 100644\n--- a/plone/portlets/storage.py\n+++ b/plone/portlets/storage.py\n@@ -74,7 +74,7 @@ class PortletAssignmentMapping(OrderedContainer):\n \n def __init__(self, manager="", category="", name=""):\n # XXX: This depends on implementation detail in OrderedContainer,\n- # but it uses a PersistentDict, which sucks :-/\n+ # but it uses a PersistentMapping, which sucks :-/\n OrderedContainer.__init__(self)\n self._data = OOBTree()\n \n'

Repository: plone.portlets


Branch: refs/heads/master
Date: 2025-01-21T18:00:54-08:00
Branch: refs/heads/main
Date: 2025-01-21T18:54:28-08:00
Author: David Glick (davisagli) <david@glicksoftware.com>
Commit: https://github.com/plone/plone.portlets/commit/886c2858e4b3a7470fec1483da356b6b43f42b72
Commit: https://github.com/plone/plone.restapi/commit/b8f1594a968fb33c78205980e4414d1c4b429e2f

Merge pull request #28 from plone/maurits-warnings
Update Plone test versions, and pin twine (#1865)

Fix DeprecationWarnings.
* Update Plone test versions, and pin twine

* Avoid overriding version pins

* Remove Python 3.8 from the test matrix for Plone 6.0, where it is no longer supported

* update test output for new minor Plone version

Files changed:
A news/4090.bugfix
M plone/portlets/assignable.py
M plone/portlets/settings.py
M plone/portlets/storage.py

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/portlets/assignable.py b/plone/portlets/assignable.py\nindex 049ac6d..1d1dc6f 100644\n--- a/plone/portlets/assignable.py\n+++ b/plone/portlets/assignable.py\n@@ -1,5 +1,5 @@\n from BTrees.OOBTree import OOBTree\n-from persistent.dict import PersistentDict\n+from persistent.mapping import PersistentMapping\n from plone.portlets.constants import CONTEXT_ASSIGNMENT_KEY\n from plone.portlets.constants import CONTEXT_BLACKLIST_STATUS_KEY\n from plone.portlets.constants import CONTEXT_CATEGORY\n@@ -68,13 +68,13 @@ def _getBlacklist(self, create=False):\n local = annotations.get(CONTEXT_BLACKLIST_STATUS_KEY, None)\n if local is None:\n if create:\n- local = annotations[CONTEXT_BLACKLIST_STATUS_KEY] = PersistentDict()\n+ local = annotations[CONTEXT_BLACKLIST_STATUS_KEY] = PersistentMapping()\n else:\n return None\n blacklist = local.get(self.manager.__name__, None)\n if blacklist is None:\n if create:\n- blacklist = local[self.manager.__name__] = PersistentDict()\n+ blacklist = local[self.manager.__name__] = PersistentMapping()\n else:\n return None\n return blacklist\ndiff --git a/plone/portlets/settings.py b/plone/portlets/settings.py\nindex dc5456f..a06f58b 100644\n--- a/plone/portlets/settings.py\n+++ b/plone/portlets/settings.py\n@@ -1,4 +1,4 @@\n-from persistent.dict import PersistentDict\n+from persistent.mapping import PersistentMapping\n from plone.portlets.constants import ASSIGNMENT_SETTINGS_KEY\n from plone.portlets.interfaces import IPortletAssignment\n from plone.portlets.interfaces import IPortletAssignmentSettings\n@@ -12,7 +12,7 @@\n @implementer(IPortletAssignmentSettings)\n class PortletAssignmentSettings(Contained):\n def __init__(self):\n- self.data = PersistentDict()\n+ self.data = PersistentMapping()\n \n def __setitem__(self, name, value):\n self.data[name] = value\ndiff --git a/plone/portlets/storage.py b/plone/portlets/storage.py\nindex e2c58ca..334d973 100644\n--- a/plone/portlets/storage.py\n+++ b/plone/portlets/storage.py\n@@ -74,7 +74,7 @@ class PortletAssignmentMapping(OrderedContainer):\n \n def __init__(self, manager="", category="", name=""):\n # XXX: This depends on implementation detail in OrderedContainer,\n- # but it uses a PersistentDict, which sucks :-/\n+ # but it uses a PersistentMapping, which sucks :-/\n OrderedContainer.__init__(self)\n self._data = OOBTree()\n \n'
A news/1685.internal
M .github/workflows/tests.yml
M plone-6.0.x-python3.8.cfg
M plone-6.0.x.cfg
M plone-6.1.x.cfg
M requirements-6.0.txt
M requirements-6.1.txt
M src/plone/restapi/tests/http-examples/registry_get_list.resp
M src/plone/restapi/tests/http-examples/site_get.resp

b'diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml\nindex 72d7ada3f..bd31daf00 100644\n--- a/.github/workflows/tests.yml\n+++ b/.github/workflows/tests.yml\n@@ -10,8 +10,6 @@ jobs:\n include:\n - python-version: "3.8"\n plone-version: "5.2"\n- - python-version: "3.8"\n- plone-version: "6.0"\n - python-version: "3.9"\n plone-version: "6.0"\n - python-version: "3.10"\ndiff --git a/news/1685.internal b/news/1685.internal\nnew file mode 100644\nindex 000000000..6fe9f0e0d\n--- /dev/null\n+++ b/news/1685.internal\n@@ -0,0 +1 @@\n+Update CI. @davisagli\ndiff --git a/plone-6.0.x-python3.8.cfg b/plone-6.0.x-python3.8.cfg\nindex 2bd12daf3..c093e3296 100644\n--- a/plone-6.0.x-python3.8.cfg\n+++ b/plone-6.0.x-python3.8.cfg\n@@ -1,6 +1,6 @@\n [buildout]\n extends =\n- https://dist.plone.org/release/6.0.12/versions.cfg\n+ https://dist.plone.org/release/6.0.14/versions.cfg\n base.cfg\n \n [instance]\n@@ -15,3 +15,4 @@ robotframework-assertion-engine = 2.0.0\n robotframework-debuglibrary = 2.3.0\n robotframework-pythonlibcore = 4.2.0\n grpcio-tools = 1.59.0\n+twine = 5.1.1\ndiff --git a/plone-6.0.x.cfg b/plone-6.0.x.cfg\nindex 26373fac8..eba5ea414 100644\n--- a/plone-6.0.x.cfg\n+++ b/plone-6.0.x.cfg\n@@ -1,24 +1,11 @@\n [buildout]\n extends =\n- https://dist.plone.org/release/6.0.12/versions.cfg\n+ https://dist.plone.org/release/6.0.14/versions.cfg\n base.cfg\n \n-[buildout:python37]\n-parts =\n- test\n- code-analysis\n-\n [instance]\n recipe = plone.recipe.zope2instance\n zodb-temporary-storage = off\n \n [versions]\n-# Override pin from Zope. https://github.com/zopefoundation/Zope/issues/1220\n-docutils = 0.21.2\n-pygments = 2.14.0\n-plone.app.linkintegrity = 4.0.3\n-robotframework-browser = 17.5.2\n-robotframework-assertion-engine = 2.0.0\n-robotframework-debuglibrary = 2.3.0\n-robotframework-pythonlibcore = 4.2.0\n-grpcio-tools = 1.59.0\n+twine = 5.1.1\ndiff --git a/plone-6.1.x.cfg b/plone-6.1.x.cfg\nindex 54716fa95..10bfe2830 100644\n--- a/plone-6.1.x.cfg\n+++ b/plone-6.1.x.cfg\n@@ -1,17 +1,10 @@\n [buildout]\n extends =\n- https://dist.plone.org/release/6.1.0a3/versions.cfg\n+ https://dist.plone.org/release/6.1.0b2/versions.cfg\n base.cfg\n \n-[buildout:python37]\n-parts =\n- test\n- code-analysis\n-\n [instance]\n recipe = plone.recipe.zope2instance\n zodb-temporary-storage = off\n \n [versions]\n-# Override pin from Zope. https://github.com/zopefoundation/Zope/issues/1220\n-docutils = 0.21.2\ndiff --git a/requirements-6.0.txt b/requirements-6.0.txt\nindex b654a46a9..d75ea5cca 100644\n--- a/requirements-6.0.txt\n+++ b/requirements-6.0.txt\n@@ -1 +1 @@\n--r https://dist.plone.org/release/6.0.12/requirements.txt\n+-r https://dist.plone.org/release/6.0.14/requirements.txt\ndiff --git a/requirements-6.1.txt b/requirements-6.1.txt\nindex 7ce0be7bb..1abfefefc 100644\n--- a/requirements-6.1.txt\n+++ b/requirements-6.1.txt\n@@ -1 +1 @@\n--r https://dist.plone.org/release/6.1.0a3/requirements.txt\n+-r https://dist.plone.org/release/6.1.0b2/requirements.txt\ndiff --git a/src/plone/restapi/tests/http-examples/registry_get_list.resp b/src/plone/restapi/tests/http-examples/registry_get_list.resp\nindex f172b2c8d..213ccce06 100644\n--- a/src/plone/restapi/tests/http-examples/registry_get_list.resp\n+++ b/src/plone/restapi/tests/http-examples/registry_get_list.resp\n@@ -423,5 +423,5 @@ Content-Type: application/json\n "value": "The person that created an item"\n }\n ],\n- "items_total": 2973\n+ "items_total": 2974\n }\ndiff --git a/src/plone/restapi/tests/http-examples/site_get.resp b/src/plone/restapi/tests/http-examples/site_get.resp\nindex 43a502cc1..417c0cbf8 100644\n--- a/src/plone/restapi/tests/http-examples/site_get.resp\n+++ b/src/plone/restapi/tests/http-examples/site_get.resp\n@@ -4,7 +4,7 @@ Content-Type: application/json\n {\n "@id": "http://localhost:55001/plone/@site",\n "features": {\n- "filter_aliases_by_date": false\n+ "filter_aliases_by_date": true\n },\n "plone.allowed_sizes": [\n "huge 1600:65536",\n'

0 comments on commit 64b6a88

Please sign in to comment.