Skip to content

Commit b8f1594

Browse files
authored
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
1 parent 18da4ec commit b8f1594

File tree

9 files changed

+10
-30
lines changed

9 files changed

+10
-30
lines changed

.github/workflows/tests.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ jobs:
1010
include:
1111
- python-version: "3.8"
1212
plone-version: "5.2"
13-
- python-version: "3.8"
14-
plone-version: "6.0"
1513
- python-version: "3.9"
1614
plone-version: "6.0"
1715
- python-version: "3.10"

news/1685.internal

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update CI. @davisagli

plone-6.0.x-python3.8.cfg

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[buildout]
22
extends =
3-
https://dist.plone.org/release/6.0.12/versions.cfg
3+
https://dist.plone.org/release/6.0.14/versions.cfg
44
base.cfg
55

66
[instance]
@@ -15,3 +15,4 @@ robotframework-assertion-engine = 2.0.0
1515
robotframework-debuglibrary = 2.3.0
1616
robotframework-pythonlibcore = 4.2.0
1717
grpcio-tools = 1.59.0
18+
twine = 5.1.1

plone-6.0.x.cfg

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,11 @@
11
[buildout]
22
extends =
3-
https://dist.plone.org/release/6.0.12/versions.cfg
3+
https://dist.plone.org/release/6.0.14/versions.cfg
44
base.cfg
55

6-
[buildout:python37]
7-
parts =
8-
test
9-
code-analysis
10-
116
[instance]
127
recipe = plone.recipe.zope2instance
138
zodb-temporary-storage = off
149

1510
[versions]
16-
# Override pin from Zope. https://github.com/zopefoundation/Zope/issues/1220
17-
docutils = 0.21.2
18-
pygments = 2.14.0
19-
plone.app.linkintegrity = 4.0.3
20-
robotframework-browser = 17.5.2
21-
robotframework-assertion-engine = 2.0.0
22-
robotframework-debuglibrary = 2.3.0
23-
robotframework-pythonlibcore = 4.2.0
24-
grpcio-tools = 1.59.0
11+
twine = 5.1.1

plone-6.1.x.cfg

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
[buildout]
22
extends =
3-
https://dist.plone.org/release/6.1.0a3/versions.cfg
3+
https://dist.plone.org/release/6.1.0b2/versions.cfg
44
base.cfg
55

6-
[buildout:python37]
7-
parts =
8-
test
9-
code-analysis
10-
116
[instance]
127
recipe = plone.recipe.zope2instance
138
zodb-temporary-storage = off
149

1510
[versions]
16-
# Override pin from Zope. https://github.com/zopefoundation/Zope/issues/1220
17-
docutils = 0.21.2

requirements-6.0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
-r https://dist.plone.org/release/6.0.12/requirements.txt
1+
-r https://dist.plone.org/release/6.0.14/requirements.txt

requirements-6.1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
-r https://dist.plone.org/release/6.1.0a3/requirements.txt
1+
-r https://dist.plone.org/release/6.1.0b2/requirements.txt

src/plone/restapi/tests/http-examples/registry_get_list.resp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,5 +423,5 @@ Content-Type: application/json
423423
"value": "The person that created an item"
424424
}
425425
],
426-
"items_total": 2973
426+
"items_total": 2974
427427
}

src/plone/restapi/tests/http-examples/site_get.resp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Content-Type: application/json
44
{
55
"@id": "http://localhost:55001/plone/@site",
66
"features": {
7-
"filter_aliases_by_date": false
7+
"filter_aliases_by_date": true
88
},
99
"plone.allowed_sizes": [
1010
"huge 1600:65536",

0 commit comments

Comments
 (0)