Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Plone test versions, and pin twine #1865

Merged
merged 4 commits into from
Jan 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions news/1685.internal
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update CI. @davisagli
3 changes: 2 additions & 1 deletion plone-6.0.x-python3.8.cfg
Original file line number Diff line number Diff line change
@@ -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]
Expand All @@ -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
17 changes: 2 additions & 15 deletions plone-6.0.x.cfg
Original file line number Diff line number Diff line change
@@ -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
9 changes: 1 addition & 8 deletions plone-6.1.x.cfg
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion requirements-6.0.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-r https://dist.plone.org/release/6.0.12/requirements.txt
-r https://dist.plone.org/release/6.0.14/requirements.txt
2 changes: 1 addition & 1 deletion requirements-6.1.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-r https://dist.plone.org/release/6.1.0a3/requirements.txt
-r https://dist.plone.org/release/6.1.0b2/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -423,5 +423,5 @@ Content-Type: application/json
"value": "The person that created an item"
}
],
"items_total": 2973
"items_total": 2974
}
2 changes: 1 addition & 1 deletion src/plone/restapi/tests/http-examples/site_get.resp
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading