Skip to content

Commit

Permalink
Fix GHA: ubuntu-latest no longer contains Python 3.5 and 3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Howitz committed Dec 15, 2022
1 parent 8203854 commit 748e0f6
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 9 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/tests.yml
Expand Up @@ -17,7 +17,7 @@ jobs:
fail-fast: false
matrix:
os:
- ubuntu
- ["ubuntu", "ubuntu-20.04"]
config:
# [Python version, tox env]
- ["3.9", "lint"]
Expand All @@ -28,22 +28,23 @@ jobs:
- ["3.8", "py38"]
- ["3.9", "py39"]
- ["3.10", "py310"]
- ["3.11", "py311"]
- ["3.9", "docs"]
- ["3.9", "coverage"]
- ["2.7", "py27-zserver"]
- ["3.7", "py37-ip_range"]

runs-on: ${{ matrix.os }}-latest
runs-on: ${{ matrix.os[1] }}
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
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
3 changes: 2 additions & 1 deletion .meta.toml
Expand Up @@ -2,7 +2,7 @@
# https://github.com/zopefoundation/meta/tree/master/config/zope-product
[meta]
template = "zope-product"
commit-id = "b5df3766ff8923477f3d24729b19504f0c401a2e"
commit-id = "200573eb414d2228d463da3de7d71a6d6335a704"

[python]
with-pypy = false
Expand All @@ -11,6 +11,7 @@ with-docs = true
with-sphinx-doctests = false
with-windows = false
with-future-python = false
with-macos = false

[coverage]
fail-under = 89
Expand Down
2 changes: 2 additions & 0 deletions CHANGES.rst
Expand Up @@ -5,6 +5,8 @@ Change Log
------------------


- Add support for Python 3.11.

2.7.1 (2022-10-04)
------------------

Expand Down
4 changes: 2 additions & 2 deletions setup.py
Expand Up @@ -43,9 +43,9 @@ def _package_doc(name):
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Topic :: Software Development',
'Topic :: System :: Systems Administration :: '
'Authentication/Directory',
'Topic :: System :: Systems Administration :: Authentication/Directory', # noqa: E501 line too long
],
keywords='web application server zope',
author='Zope Foundation and Contributors',
Expand Down
3 changes: 2 additions & 1 deletion tox.ini
Expand Up @@ -11,6 +11,7 @@ envlist =
py38
py39
py310
py311
docs
coverage
py27-zserver
Expand All @@ -19,7 +20,7 @@ envlist =
[testenv]
skip_install = true
deps =
zc.buildout >= 3.0.0rc3
zc.buildout >= 3.0.1
wheel > 0.37
commands_pre =
py27,py35: {envbindir}/buildout -nc {toxinidir}/buildout4.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
Expand Down

0 comments on commit 748e0f6

Please sign in to comment.