Skip to content

Commit

Permalink
Support Plone 6.0.0a2
Browse files Browse the repository at this point in the history
  • Loading branch information
ericof committed Dec 6, 2021
1 parent 21966ff commit 2102edd
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
fail-fast: false
matrix:
python: [3.7, 3.8, 3.9]
plone: ["6.0.0a1", "5.2-latest"]
plone: ["6.0.0a2", "5.2-latest"]
exclude:
- plone: "5.2-latest"
python: 3.9
Expand Down
5 changes: 4 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ Changelog
3.1.0a7 (unreleased)
--------------------

- Nothing changed yet.
Internal:

- Test with Plone 6.0.0a2
[ericof]


3.1.0a6 (2021-11-22)
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ build: .installed.cfg ## Build Plone 5.2
.PHONY: Build Plone 6.0
build-plone-6.0: bin/pip ## Build Plone 6.0
bin/pip install --upgrade pip
bin/pip install -r https://dist.plone.org/release/6.0.0a1/requirements.txt
bin/pip install -r https://dist.plone.org/release/6.0.0a2/requirements.txt
bin/buildout -c plone-6.0.x.cfg

.PHONY: Test
Expand Down
1 change: 1 addition & 0 deletions plone-5.2.x.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
extends =
base.cfg
http://dist.plone.org/release/5.2.5/versions.cfg

find-links += http://dist.plone.org/thirdparty/

[versions]
Expand Down
7 changes: 4 additions & 3 deletions plone-6.0.x.cfg
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
[buildout]
extends =
https://dist.plone.org/release/6.0.0a1/versions.cfg
https://dist.plone.org/release/6.0.0a2/versions.cfg
base.cfg
find-links = https://dist.plone.org/release/6.0.0a1/
versions=versions

find-links += https://dist.plone.org/release/6.0.0a2/


[instance]
recipe = plone.recipe.zope2instance
zodb-temporary-storage = off

[versions]
plone.volto =
black = 21.7b0

# cffi 1.14.3 fails on apple m1
Expand Down
2 changes: 1 addition & 1 deletion requirements/plone-6.0.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
-c https://dist.plone.org/release/6.0.0a1/constraints.txt
-c https://dist.plone.org/release/6.0.0a2/constraints.txt
wheel
Plone

0 comments on commit 2102edd

Please sign in to comment.