diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d0723a7444..8b160f720f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -49,8 +49,8 @@ jobs: with: persist-credentials: false - name: Install uv + caching - # astral/setup-uv@7.1.4 - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 + # astral/setup-uv@7.2.0 + uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b with: enable-cache: true cache-dependency-glob: | @@ -59,11 +59,7 @@ jobs: python-version: ${{ matrix.config[0] }} github-token: ${{ secrets.GITHUB_TOKEN }} - name: Test - if: ${{ !startsWith(runner.os, 'Mac') }} run: uvx --with tox-uv tox -e ${{ matrix.config[1] }} - - name: Test (macOS) - if: ${{ startsWith(runner.os, 'Mac') }} - run: uvx --with tox-uv tox -e ${{ matrix.config[1] }}-universal2 - name: Coverage if: matrix.config[1] == 'coverage' run: | diff --git a/.meta.toml b/.meta.toml index dae05ef7af..8934706a50 100644 --- a/.meta.toml +++ b/.meta.toml @@ -2,7 +2,7 @@ # https://github.com/zopefoundation/meta/tree/master/src/zope/meta/zope-product [meta] template = "zope-product" -commit-id = "446e9797" +commit-id = "8bf5a8e1" [python] with-pypy = false @@ -29,34 +29,11 @@ additional-config = [ ] [tox] -testenv-deps = [ - "cffi >= 1.17.0rc1", - "# The universal2 environment is for Python on macOS built with", - "# universal2 mode instead of architecture-specific. These dependencies", - "# must be installed separately, zc.buildout is incompatible with the", - "# universal2 mode and cannot install them itself.", - "universal2: -c {toxinidir}/constraints.txt", - "universal2: zope.interface", - "universal2: zope.security", - "universal2: zope.container", - "universal2: Persistence", - "universal2: Acquisition", - "universal2: AccessControl", - "universal2: zodbpickle", - "universal2: charset_normalizer", - "universal2: MarkupSafe", - "universal2: zope.testrunner", - ] testenv-commands-pre = [ "{envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} buildout:root-directory={toxinidir}", ] testenv-commands = [ - "# The universal2 environment only runs Zope's own tests", - "universal2: {envdir}/bin/test {posargs:-vc}", - "# All other environments run the expanded alltests script", - "# the `layer` argument below suppresses a `ZCatalog` performance test", - "# which occasionally fails on GITHUB", - "!universal2: {envdir}/bin/alltests --layer '!Products.PluginIndexes' {posargs:-vc}", + "{envdir}/bin/alltests --layer '!Products.PluginIndexes' {posargs:-vc}", ] coverage-command = "coverage run {envdir}/bin/alltests {posargs:-vc}" testenv-additional = [ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0061aaf42e..c0e8bb8f3f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,7 +12,7 @@ repos: - id: autopep8 args: [--in-place, --aggressive, --aggressive] - repo: https://github.com/asottile/pyupgrade - rev: v3.21.0 + rev: v3.21.2 hooks: - id: pyupgrade args: [--py310-plus] diff --git a/tox.ini b/tox.ini index 13b7e95866..0e9ceed624 100644 --- a/tox.ini +++ b/tox.ini @@ -19,32 +19,11 @@ deps = setuptools >= 78.1.1,< 81 zc.buildout wheel - cffi >= 1.17.0rc1 - # The universal2 environment is for Python on macOS built with - # universal2 mode instead of architecture-specific. These dependencies - # must be installed separately, zc.buildout is incompatible with the - # universal2 mode and cannot install them itself. - universal2: -c {toxinidir}/constraints.txt - universal2: zope.interface - universal2: zope.security - universal2: zope.container - universal2: Persistence - universal2: Acquisition - universal2: AccessControl - universal2: zodbpickle - universal2: charset_normalizer - universal2: MarkupSafe - universal2: zope.testrunner setenv = commands_pre = {envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} buildout:root-directory={toxinidir} commands = - # The universal2 environment only runs Zope's own tests - universal2: {envdir}/bin/test {posargs:-vc} - # All other environments run the expanded alltests script - # the `layer` argument below suppresses a `ZCatalog` performance test - # which occasionally fails on GITHUB - !universal2: {envdir}/bin/alltests --layer '!Products.PluginIndexes' {posargs:-vc} + {envdir}/bin/alltests --layer '!Products.PluginIndexes' {posargs:-vc} allowlist_externals = * [testenv:setuptools-latest] @@ -53,22 +32,6 @@ deps = git+https://github.com/pypa/setuptools.git\#egg=setuptools zc.buildout wheel - cffi >= 1.17.0rc1 - # The universal2 environment is for Python on macOS built with - # universal2 mode instead of architecture-specific. These dependencies - # must be installed separately, zc.buildout is incompatible with the - # universal2 mode and cannot install them itself. - universal2: -c {toxinidir}/constraints.txt - universal2: zope.interface - universal2: zope.security - universal2: zope.container - universal2: Persistence - universal2: Acquisition - universal2: AccessControl - universal2: zodbpickle - universal2: charset_normalizer - universal2: MarkupSafe - universal2: zope.testrunner [testenv:release-check]