diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8911d57..9d5e371 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: os: - - ubuntu + - ["ubuntu", "ubuntu-20.04"] config: # [Python version, tox env] - ["3.9", "lint"] @@ -28,18 +28,20 @@ jobs: - ["3.8", "py38"] - ["3.9", "py39"] - ["3.10", "py310"] + - ["3.11", "py311"] - ["3.9", "coverage"] - 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') }} diff --git a/.meta.toml b/.meta.toml index e44b91d..c3362c0 100644 --- a/.meta.toml +++ b/.meta.toml @@ -2,7 +2,7 @@ # https://github.com/zopefoundation/meta/tree/master/config/zope-product [meta] template = "zope-product" -commit-id = "9a5db8c650c45a439db06e3a7b2b86318006659d" +commit-id = "d6240444ec6c9e203f2fd9f62c3e6038f9189e96" [python] with-pypy = false @@ -10,6 +10,7 @@ with-legacy-python = true with-sphinx-doctests = false with-windows = false with-future-python = false +with-macos = false [tox] use-flake8 = true diff --git a/CHANGES.rst b/CHANGES.rst index f3002f3..eb47032 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,10 +1,13 @@ Changelog ========= -4.2 (unreleased) +4.2 (2022-12-16) ---------------- -- Add support for Python 3.10. +- Fix insidious buildout configuration bug for tests against Zope 4. + +- Add support for Python 3.10 and 3.11. + 4.1.1 (2021-07-02) ------------------ diff --git a/buildout4.cfg b/buildout4.cfg index b4bc622..03ebfe1 100644 --- a/buildout4.cfg +++ b/buildout4.cfg @@ -3,3 +3,5 @@ extends = buildout.cfg http://zopefoundation.github.io/Zope/releases/4.x/versions.cfg +[versions] +Products.StandardCacheManagers = diff --git a/setup.py b/setup.py index 00d4a2e..b6da875 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ def _read(fname): setup(name='Products.StandardCacheManagers', - version='4.2.dev0', + version='4.2', url='https://github.com/zopefoundation/Products.StandardCacheManagers', project_urls={ 'Issue Tracker': ('https://github.com/zopefoundation' @@ -56,6 +56,7 @@ def _read(fname): "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", "Programming Language :: Python :: Implementation :: CPython", ], python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*', diff --git a/tox.ini b/tox.ini index e5632f5..4897c6d 100644 --- a/tox.ini +++ b/tox.ini @@ -11,18 +11,19 @@ envlist = py38 py39 py310 + py311 coverage [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 !py27-!py35: {envbindir}/buildout -nc {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test commands = - {envbindir}/test {posargs:-cv} + {envdir}/bin/test {posargs:-cv} [testenv:lint] basepython = python3 @@ -65,7 +66,7 @@ deps = coverage-python-version commands = mkdir -p {toxinidir}/parts/htmlcov - coverage run {envbindir}/test {posargs:-cv} + coverage run {envdir}/bin/test {posargs:-cv} coverage html coverage report -m --fail-under=50