Skip to content

Commit

Permalink
[fc] Repository: plone.rest
Browse files Browse the repository at this point in the history
Branch: refs/heads/master
Date: 2023-09-22T09:54:23+02:00
Author: Timo Stollenwerk (tisto) <[email protected]>
Commit: plone/plone.rest@de3266d

Drop Python 2.7, 3.6 and 3.7 (#156)

* Upgrade to Plone 6.0.7

* Drop Python 2.7 support

* Add changelog, remove 3.6 and 3.7

* Don't break on py 3.6 and 3.7, just drop official support

* python_requires&gt;=3.8

Files changed:
A news/141.breaking
M .github/workflows/tests.yml
M plone-6.0.x.cfg
M setup.py
  • Loading branch information
tisto committed Sep 22, 2023
1 parent d895842 commit 872cfc5
Showing 1 changed file with 20 additions and 8 deletions.
28 changes: 20 additions & 8 deletions last_commit.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,28 @@
Repository: plone.restapi
Repository: plone.rest


Branch: refs/heads/main
Date: 2023-09-21T14:15:10-07:00
Branch: refs/heads/master
Date: 2023-09-22T09:54:23+02:00
Author: Timo Stollenwerk (tisto) <[email protected]>
Commit: https://github.com/plone/plone.restapi/commit/3e3f58a0a3780addf59a8862c957a0f15038b1a1
Commit: https://github.com/plone/plone.rest/commit/de3266d7a9c4aee9ac4977dbd5df5d272eca32a3

Undeprecate token param on vocabularies endpoint (#1708)
Drop Python 2.7, 3.6 and 3.7 (#156)

* Upgrade to Plone 6.0.7

* Drop Python 2.7 support

* Add changelog, remove 3.6 and 3.7

* Don't break on py 3.6 and 3.7, just drop official support

* python_requires&gt;=3.8

Files changed:
A news/1697.bugfix
M src/plone/restapi/serializer/vocabularies.py
A news/141.breaking
M .github/workflows/tests.yml
M plone-6.0.x.cfg
M setup.py

b'diff --git a/news/1697.bugfix b/news/1697.bugfix\nnew file mode 100644\nindex 000000000..3789f81a1\n--- /dev/null\n+++ b/news/1697.bugfix\n@@ -0,0 +1 @@\n+Undeprecate token parameter from vocabularies endpoint @tisto\n\\ No newline at end of file\ndiff --git a/src/plone/restapi/serializer/vocabularies.py b/src/plone/restapi/serializer/vocabularies.py\nindex 380040f2c..a8f7e6110 100644\n--- a/src/plone/restapi/serializer/vocabularies.py\n+++ b/src/plone/restapi/serializer/vocabularies.py\n@@ -11,8 +11,6 @@\n from zope.schema.interfaces import ITokenizedTerm\n from zope.schema.interfaces import IVocabulary\n \n-import warnings\n-\n \n @implementer(ISerializeToJson)\n class SerializeVocabLikeToJson:\n@@ -44,10 +42,8 @@ def __call__(self, vocabulary_id):\n )\n \n if token:\n- warnings.warn(\n- "``token`` parameter is deprecated and will be removed in plone.restapi 9.0. Use ``tokens`` parameter instead.",\n- DeprecationWarning,\n- )\n+ # the token parameter was deprecated in plone.restapi 8\n+ # undeprecated in plone.restapi 9\n if token.lower() != term.token.lower():\n continue\n terms.append(term)\n'
b'diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml\nindex ad015c6..1ec8c65 100644\n--- a/.github/workflows/tests.yml\n+++ b/.github/workflows/tests.yml\n@@ -6,11 +6,9 @@ jobs:\n strategy:\n fail-fast: false\n matrix:\n- python-version: ["3.11", "3.10", "3.9", "3.8", "2.7"]\n+ python-version: ["3.11", "3.10", "3.9", "3.8"]\n plone-version: ["6.0", "5.2"]\n exclude:\n- - python-version: 2.7\n- plone-version: 6.0\n - python-version: 3.11\n plone-version: 5.2\n - python-version: 3.10\ndiff --git a/news/141.breaking b/news/141.breaking\nnew file mode 100644\nindex 0000000..e86d4ff\n--- /dev/null\n+++ b/news/141.breaking\n@@ -0,0 +1 @@\n+Drop support for Python 2.7, 3.6 and 3.7 @tisto\n\\ No newline at end of file\ndiff --git a/plone-6.0.x.cfg b/plone-6.0.x.cfg\nindex 07cbb26..0ec46f1 100644\n--- a/plone-6.0.x.cfg\n+++ b/plone-6.0.x.cfg\n@@ -1,6 +1,6 @@\n [buildout]\n extends =\n- https://dist.plone.org/release/6.0.0/versions.cfg\n+ https://dist.plone.org/release/6.0.7/versions.cfg\n base.cfg\n \n [instance]\ndiff --git a/setup.py b/setup.py\nindex 5b271a0..76adb4c 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -31,13 +31,12 @@ def read(*rnames):\n "License :: OSI Approved :: GNU General Public License (GPL)",\n "Operating System :: OS Independent",\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 "Programming Language :: Python :: 3.9",\n "Programming Language :: Python :: 3.10",\n "Programming Language :: Python :: 3.11",\n+ "Programming Language :: Python :: 3 :: Only",\n+ "Topic :: Software Development :: Libraries :: Python Modules",\n ],\n keywords="rest http",\n author="Plone Foundation",\n@@ -49,7 +48,7 @@ def read(*rnames):\n namespace_packages=["plone"],\n include_package_data=True,\n zip_safe=False,\n- python_requires=">=2.7",\n+ python_requires=">=3.8",\n extras_require=dict(\n test=[\n "plone.app.testing[robot]>=4.2.2",\n'

0 comments on commit 872cfc5

Please sign in to comment.