-
-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Branch: refs/heads/master Date: 2023-09-22T10:00:42+02:00 Author: Timo Stollenwerk (tisto) <[email protected]> Commit: plone/plone.rest@df7fc7d Use ubuntu-latest and rename GHA tests Files changed: M .github/workflows/tests.yml Repository: plone.rest Branch: refs/heads/master Date: 2023-09-22T10:03:26+02:00 Author: Timo Stollenwerk (tisto) <[email protected]> Commit: plone/plone.rest@d83a8ad Merge branch 'master' of github.com:plone/plone.rest Files changed: A news/141.breaking M .github/workflows/tests.yml M plone-6.0.x.cfg M setup.py
- Loading branch information
Showing
1 changed file
with
21 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,27 +2,32 @@ Repository: plone.rest | |
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2023-09-22T09:54:23+02:00 | ||
| Author: Timo Stollenwerk (tisto) <[email protected]> | ||
| Commit: https://github.com/plone/plone.rest/commit/de3266d7a9c4aee9ac4977dbd5df5d272eca32a3 | ||
|
|
||
| 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>=3.8 | ||
| Date: 2023-09-22T10:00:42+02:00 | ||
| Author: Timo Stollenwerk (tisto) <[email protected]> | ||
| Commit: https://github.com/plone/plone.rest/commit/df7fc7d58d46e6ff4d894b3d34dcbd644649f643 | ||
|
|
||
| Use ubuntu-latest and rename GHA tests | ||
|
|
||
| Files changed: | ||
| M .github/workflows/tests.yml | ||
|
|
||
| b'diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml\nindex ad015c6..921960c 100644\n--- a/.github/workflows/tests.yml\n+++ b/.github/workflows/tests.yml\n@@ -1,8 +1,8 @@\n-name: plone.rest CI\n+name: Tests\n on: [push]\n jobs:\n build:\n- runs-on: "ubuntu-20.04" # needed to keep Python 2.7\n+ runs-on: ubuntu-latest\n strategy:\n fail-fast: false\n matrix:\n' | ||
|
|
||
| Repository: plone.rest | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2023-09-22T10:03:26+02:00 | ||
| Author: Timo Stollenwerk (tisto) <[email protected]> | ||
| Commit: https://github.com/plone/plone.rest/commit/d83a8adecdc469cbabd17e6456617b4a4056d434 | ||
|
|
||
| Merge branch 'master' of github.com:plone/plone.rest | ||
|
|
||
| Files changed: | ||
| A news/141.breaking | ||
| M .github/workflows/tests.yml | ||
| M plone-6.0.x.cfg | ||
| M setup.py | ||
|
|
||
| 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' | ||
| b'diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml\nindex 921960c..5fd38da 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' | ||
|
|
||