From 7f508a87b24b05abec0b0a80a6169fb83dc9c77a Mon Sep 17 00:00:00 2001 From: Jens Vagelpohl Date: Fri, 30 Aug 2024 07:17:59 +0200 Subject: [PATCH] - use setuptools 74 and buildout 3.1 --- .github/workflows/tests.yml | 12 ++++++------ .meta.toml | 2 +- tox.ini | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 72781a9..790d468 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -156,12 +156,12 @@ jobs: if: matrix.python-version == '3.13' run: | pip install -U pip - pip install -U "setuptools<69" wheel twine + pip install -U "setuptools<74" wheel twine - name: Install Build Dependencies if: matrix.python-version != '3.13' run: | pip install -U pip - pip install -U "setuptools<69" wheel twine + pip install -U "setuptools<74" wheel twine - name: Build Acquisition (macOS x86_64) if: > @@ -327,7 +327,7 @@ jobs: - name: Install Acquisition ${{ matrix.python-version }} if: matrix.python-version == '3.13' run: | - pip install -U wheel "setuptools<69" + pip install -U wheel "setuptools<74" # coverage might have a wheel on PyPI for a future python version which is # not ABI compatible with the current one, so build it from sdist: pip install -U --no-binary :all: coverage @@ -337,18 +337,18 @@ jobs: unzip -n dist/Acquisition-*whl -d src # Use "--pre" here because dependencies with support for this future # Python release may only be available as pre-releases - pip install --pre -U -e .[test] + pip install --pre -e .[test] - name: Install Acquisition if: matrix.python-version != '3.13' run: | - pip install -U wheel "setuptools<69" + pip install -U wheel "setuptools<74" pip install -U coverage pip install -U 'cffi; platform_python_implementation == "CPython"' # Unzip into src/ so that testrunner can find the .so files # when we ask it to load tests from that directory. This # might also save some build time? unzip -n dist/Acquisition-*whl -d src - pip install -U -e .[test] + pip install -e .[test] - name: Run tests with C extensions if: ${{ !startsWith(matrix.python-version, 'pypy') }} run: | diff --git a/.meta.toml b/.meta.toml index 8ba507c..35a69f3 100644 --- a/.meta.toml +++ b/.meta.toml @@ -2,7 +2,7 @@ # https://github.com/zopefoundation/meta/tree/master/config/c-code [meta] template = "c-code" -commit-id = "4eec7859" +commit-id = "a1e05e74" [python] with-windows = true diff --git a/tox.ini b/tox.ini index dac826a..c7a7bda 100644 --- a/tox.ini +++ b/tox.ini @@ -16,7 +16,7 @@ envlist = [testenv] pip_pre = py313: true deps = - setuptools < 69 + setuptools < 74 setenv = pure: PURE_PYTHON=1 !pure-!pypy3: PURE_PYTHON=0