Skip to content

Commit

Permalink
Merge pull request #388 from collective/maurits-tox-311
Browse files Browse the repository at this point in the history
Require at least Python 3.8.  Test with 3.8-3.11.
  • Loading branch information
mauritsvanrees authored Dec 13, 2022
2 parents 38ec9cb + aaef729 commit 3cb4679
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 10 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [ master ]
pull_request:
branches: [ master, 3.x ]
branches: [ master ]
workflow_dispatch:
jobs:
build:
Expand All @@ -16,16 +16,17 @@ jobs:
- ["3.8", "plone60-py38"]
- ["3.9", "plone60-py39"]
- ["3.10", "plone60-py310"]
- ["3.11", "plone60-py311"]
runs-on: ubuntu-latest
name: ${{ matrix.config[1] }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.config[0] }}
- name: Pip cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }}
Expand Down
4 changes: 2 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Changelog
4.1.2 (unreleased)
------------------

- Nothing changed yet.
- Require at least Python 3.8. Test with 3.8-3.11. [maurits]


4.1.1 (2022-10-28)
Expand Down Expand Up @@ -76,7 +76,7 @@ Enhancements:

Breaking change:

- This is for Plone 6 only. At least this is the only version that is tested.
- This is for Plone 6 only. At least this is the only version that is tested.
(Changelog edited later to avoid misunderstandings, use 3.x for Plone 5.2)
[maurits]

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
zc.buildout==3.0.0rc3
zc.buildout==3.0.1
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@
"Framework :: Plone :: Addon",
"Framework :: Plone :: 6.0",
"Programming Language :: Python",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Operating System :: OS Independent",
"License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
],
Expand All @@ -36,6 +37,7 @@
package_dir={"": "src"},
include_package_data=True,
zip_safe=False,
python_requires=">=3.8",
install_requires=[
"plone.api",
"plone.app.dexterity",
Expand Down
5 changes: 3 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tox]
minversion = 3.18
envlist =
plone60-py{38,39,310}
plone60-py{38,39,310,311}

[testenv]
# We do not install with pip, but with buildout:
Expand All @@ -12,4 +12,5 @@ deps =
commands_pre =
plone60: {envbindir}/buildout -Nc {toxinidir}/tests-6.0.x.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
commands =
{envbindir}/test
# Note: to run the robot tests, we should pass --all. Currently all four fail.
{envbindir}/test {posargs:-vc}

0 comments on commit 3cb4679

Please sign in to comment.