diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 69fab7091f..7fff195c89 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,9 +17,9 @@ jobs: fail-fast: false matrix: os: - - ["ubuntu", "ubuntu-20.04"] + - ["ubuntu", "ubuntu-latest"] - ["windows", "windows-latest"] - - ["macos", "macos-11"] + - ["macos", "macos-latest"] config: # [Python version, tox env] - ["3.9", "release-check"] @@ -37,26 +37,26 @@ jobs: - { os: ["windows", "windows-latest"], config: ["3.9", "lint"] } - { os: ["windows", "windows-latest"], config: ["3.9", "docs"] } - { os: ["windows", "windows-latest"], config: ["3.9", "coverage"] } - - { os: ["macos", "macos-11"], config: ["3.9", "release-check"] } - - { os: ["macos", "macos-11"], config: ["3.9", "lint"] } - - { os: ["macos", "macos-11"], config: ["3.9", "docs"] } - - { os: ["macos", "macos-11"], config: ["3.9", "coverage"] } + - { os: ["macos", "macos-latest"], config: ["3.9", "release-check"] } + - { os: ["macos", "macos-latest"], config: ["3.9", "lint"] } + - { os: ["macos", "macos-latest"], config: ["3.9", "docs"] } + - { os: ["macos", "macos-latest"], config: ["3.9", "coverage"] } # macOS/Python 3.11+ is set up for universal2 architecture # which causes build and package selection issues. - - { os: ["macos", "macos-11"], config: ["3.11", "py311"] } - - { os: ["macos", "macos-11"], config: ["3.12", "py312"] } + - { os: ["macos", "macos-latest"], config: ["3.11", "py311"] } + - { os: ["macos", "macos-latest"], config: ["3.12", "py312"] } 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.os[0] }}-${{ matrix.config[1] }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.config[0] }} - name: Pip cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }} diff --git a/.meta.toml b/.meta.toml index 51f8d75edd..6ad10c175e 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 = "cb0568c7" +commit-id = "5a4d3a13" [python] with-pypy = false diff --git a/setup.cfg b/setup.cfg index d5479c614a..74a640c271 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,5 @@ # Generated from: # https://github.com/zopefoundation/meta/tree/master/config/zope-product -[bdist_wheel] -universal = 0 [flake8] doctests = 1 diff --git a/tox.ini b/tox.ini index e54db0e12a..0858d492d2 100644 --- a/tox.ini +++ b/tox.ini @@ -52,7 +52,6 @@ deps = commands = autopep8 --verbose --in-place --recursive --aggressive --aggressive {toxinidir}/src setup.py docformatter --in-place --recursive {toxinidir}/src setup.py - [testenv:release-check] description = ensure that the distribution is ready to release basepython = python3 @@ -66,7 +65,7 @@ deps = commands_pre = commands = check-manifest - check-python-versions + check-python-versions --only setup.py,tox.ini,.github/workflows/tests.yml python -m build --sdist --no-isolation twine check dist/*