From b8f1594a968fb33c78205980e4414d1c4b429e2f Mon Sep 17 00:00:00 2001 From: David Glick Date: Tue, 21 Jan 2025 18:54:28 -0800 Subject: [PATCH] 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 --- .github/workflows/tests.yml | 2 -- news/1685.internal | 1 + plone-6.0.x-python3.8.cfg | 3 ++- plone-6.0.x.cfg | 17 ++--------------- plone-6.1.x.cfg | 9 +-------- requirements-6.0.txt | 2 +- requirements-6.1.txt | 2 +- .../tests/http-examples/registry_get_list.resp | 2 +- .../restapi/tests/http-examples/site_get.resp | 2 +- 9 files changed, 10 insertions(+), 30 deletions(-) create mode 100644 news/1685.internal diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 72d7ada3ff..bd31daf00a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,8 +10,6 @@ jobs: include: - python-version: "3.8" plone-version: "5.2" - - python-version: "3.8" - plone-version: "6.0" - python-version: "3.9" plone-version: "6.0" - python-version: "3.10" diff --git a/news/1685.internal b/news/1685.internal new file mode 100644 index 0000000000..6fe9f0e0dc --- /dev/null +++ b/news/1685.internal @@ -0,0 +1 @@ +Update CI. @davisagli diff --git a/plone-6.0.x-python3.8.cfg b/plone-6.0.x-python3.8.cfg index 2bd12daf3f..c093e32964 100644 --- a/plone-6.0.x-python3.8.cfg +++ b/plone-6.0.x-python3.8.cfg @@ -1,6 +1,6 @@ [buildout] extends = - https://dist.plone.org/release/6.0.12/versions.cfg + https://dist.plone.org/release/6.0.14/versions.cfg base.cfg [instance] @@ -15,3 +15,4 @@ robotframework-assertion-engine = 2.0.0 robotframework-debuglibrary = 2.3.0 robotframework-pythonlibcore = 4.2.0 grpcio-tools = 1.59.0 +twine = 5.1.1 diff --git a/plone-6.0.x.cfg b/plone-6.0.x.cfg index 26373fac81..eba5ea4141 100644 --- a/plone-6.0.x.cfg +++ b/plone-6.0.x.cfg @@ -1,24 +1,11 @@ [buildout] extends = - https://dist.plone.org/release/6.0.12/versions.cfg + https://dist.plone.org/release/6.0.14/versions.cfg base.cfg -[buildout:python37] -parts = - test - code-analysis - [instance] recipe = plone.recipe.zope2instance zodb-temporary-storage = off [versions] -# Override pin from Zope. https://github.com/zopefoundation/Zope/issues/1220 -docutils = 0.21.2 -pygments = 2.14.0 -plone.app.linkintegrity = 4.0.3 -robotframework-browser = 17.5.2 -robotframework-assertion-engine = 2.0.0 -robotframework-debuglibrary = 2.3.0 -robotframework-pythonlibcore = 4.2.0 -grpcio-tools = 1.59.0 +twine = 5.1.1 diff --git a/plone-6.1.x.cfg b/plone-6.1.x.cfg index 54716fa951..10bfe28308 100644 --- a/plone-6.1.x.cfg +++ b/plone-6.1.x.cfg @@ -1,17 +1,10 @@ [buildout] extends = - https://dist.plone.org/release/6.1.0a3/versions.cfg + https://dist.plone.org/release/6.1.0b2/versions.cfg base.cfg -[buildout:python37] -parts = - test - code-analysis - [instance] recipe = plone.recipe.zope2instance zodb-temporary-storage = off [versions] -# Override pin from Zope. https://github.com/zopefoundation/Zope/issues/1220 -docutils = 0.21.2 diff --git a/requirements-6.0.txt b/requirements-6.0.txt index b654a46a97..d75ea5cca5 100644 --- a/requirements-6.0.txt +++ b/requirements-6.0.txt @@ -1 +1 @@ --r https://dist.plone.org/release/6.0.12/requirements.txt +-r https://dist.plone.org/release/6.0.14/requirements.txt diff --git a/requirements-6.1.txt b/requirements-6.1.txt index 7ce0be7bb3..1abfefefc7 100644 --- a/requirements-6.1.txt +++ b/requirements-6.1.txt @@ -1 +1 @@ --r https://dist.plone.org/release/6.1.0a3/requirements.txt +-r https://dist.plone.org/release/6.1.0b2/requirements.txt diff --git a/src/plone/restapi/tests/http-examples/registry_get_list.resp b/src/plone/restapi/tests/http-examples/registry_get_list.resp index f172b2c8d1..213ccce065 100644 --- a/src/plone/restapi/tests/http-examples/registry_get_list.resp +++ b/src/plone/restapi/tests/http-examples/registry_get_list.resp @@ -423,5 +423,5 @@ Content-Type: application/json "value": "The person that created an item" } ], - "items_total": 2973 + "items_total": 2974 } diff --git a/src/plone/restapi/tests/http-examples/site_get.resp b/src/plone/restapi/tests/http-examples/site_get.resp index 43a502cc1e..417c0cbf83 100644 --- a/src/plone/restapi/tests/http-examples/site_get.resp +++ b/src/plone/restapi/tests/http-examples/site_get.resp @@ -4,7 +4,7 @@ Content-Type: application/json { "@id": "http://localhost:55001/plone/@site", "features": { - "filter_aliases_by_date": false + "filter_aliases_by_date": true }, "plone.allowed_sizes": [ "huge 1600:65536",