Skip to content

Commit 05487c9

Browse files
committed
WIP
1 parent fcf9714 commit 05487c9

File tree

5 files changed

+17
-64
lines changed

5 files changed

+17
-64
lines changed

.gha.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ pre-commit-hook = False
77
return-status-codes = True
88

99
[versions]
10+
# Use the versions from the requirements files
1011
setuptools =
1112
zc.buildout =

README.rst

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,17 @@ Basic Installation
3737
Compatibility
3838
-------------
3939

40-
For Plone 5.1 and 5.2 you should use version 3.x.
41-
For Plone 4.3 and 5.0 you should use version 2.x.
42-
43-
+---------------------------------------------+----------------------+----------+
44-
| Plone | Python | Version |
45-
+=============================================+======================+==========+
46-
| Plone 5.2+ | 3.8+ | 4 |
47-
+---------------------------------------------+----------------------+----------+
48-
| Plone 5.1 and 5.2 | < 3.8 | 3 |
49-
+---------------------------------------------+----------------------+----------+
50-
| Plone 4.3 and 5.0 | any | 2 |
51-
+---------------------------------------------+----------------------+----------+
40+
This table shows which version of collective.workspace is compatible with which versions of Plone and Python:
41+
42+
+---------------+----------------------+---------------------------+
43+
| Plone | Python | collective.workspace |
44+
+===============+======================+===========================+
45+
| 5.2+ | 3.8+ | 4 |
46+
+---------------+----------------------+---------------------------+
47+
| 5.1, 5.2 | 2.7 - 3.8 | 3 |
48+
+---------------+----------------------+---------------------------+
49+
| 4.3, 5.0 | 2.7 | 2 |
50+
+---------------+----------------------+---------------------------+
5251

5352
Custom Workspace Groups
5453
-----------------------

base.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ flake8-extensions =
5050
# flake8-select = E123
5151

5252
[test]
53-
recipe = collective.xmltestreport
53+
recipe = zc.recipe.testrunner
5454
eggs = ${instance:eggs}
5555
defaults = ['-s', 'collective.workspace', '--auto-color', '--auto-progress']
5656
environment = environment
@@ -106,4 +106,4 @@ mode = 755
106106
[versions]
107107
collective.workspace =
108108
setuptools =
109-
zc.buildout =
109+
zc.buildout =

plone-5.2.x.cfg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ find-links += https://dist.plone.org/thirdparty/
66
versions=versions
77
show-picked-versions = true
88

9+
[test]
10+
recipe = collective.xmltestreport
11+
912
[versions]
1013
black = 20.8b1
1114

versions.cfg

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)