From 992a844e405acc22078f23d960ae946655b68d24 Mon Sep 17 00:00:00 2001 From: Jens Vagelpohl Date: Wed, 2 Nov 2022 10:20:48 +0100 Subject: [PATCH] - update to latest meta/config --- .github/workflows/tests.yml | 24 ++++++++++++------------ .meta.toml | 2 +- appveyor.yml | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5b66a33..7445663 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -103,7 +103,7 @@ jobs: - "3.8" - "3.9" - "3.10" - - "3.11.0-rc.2" + - "3.11" os: [ubuntu-20.04, macos-latest] exclude: - os: macos-latest @@ -125,7 +125,7 @@ jobs: - name: Get pip cache dir id: pip-cache run: | - echo "::set-output name=dir::$(pip cache dir)" + echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT - name: pip cache uses: actions/cache@v2 @@ -140,8 +140,8 @@ jobs: pip install -U pip pip install -U setuptools wheel twine cffi - - name: Build AccessControl (3.11.0-rc.2) - if: ${{ startsWith(matrix.python-version, '3.11.0-rc.2') }} + - name: Build AccessControl (3.11) + if: ${{ startsWith(matrix.python-version, '3.11') }} run: | # Next, build the wheel *in place*. This helps ccache, and also lets us cache the configure # output (pip install uses a random temporary directory, making this difficult). @@ -196,7 +196,7 @@ jobs: && startsWith(github.ref, 'refs/tags') && startsWith(runner.os, 'Mac') && !startsWith(matrix.python-version, 'pypy') - && !startsWith(matrix.python-version, '3.11.0-rc.2') + && !startsWith(matrix.python-version, '3.11') env: TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }} run: | @@ -216,7 +216,7 @@ jobs: - "3.8" - "3.9" - "3.10" - - "3.11.0-rc.2" + - "3.11" os: [ubuntu-20.04, macos-latest] exclude: - os: macos-latest @@ -238,7 +238,7 @@ jobs: - name: Get pip cache dir id: pip-cache run: | - echo "::set-output name=dir::$(pip cache dir)" + echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT - name: pip cache uses: actions/cache@v2 @@ -253,8 +253,8 @@ jobs: with: name: AccessControl-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/ - - name: Install AccessControl 3.11.0-rc.2 - if: ${{ startsWith(matrix.python-version, '3.11.0-rc.2') }} + - name: Install AccessControl 3.11 + if: ${{ startsWith(matrix.python-version, '3.11') }} run: | pip install -U wheel setuptools # coverage has a wheel on PyPI for a future python version which is @@ -267,7 +267,7 @@ jobs: unzip -n dist/AccessControl-*whl -d src pip install --pre -U -e .[test] - name: Install AccessControl - if: ${{ !startsWith(matrix.python-version, '3.11.0-rc.2') }} + if: ${{ !startsWith(matrix.python-version, '3.11') }} run: | pip install -U wheel setuptools pip install -U coverage @@ -329,7 +329,7 @@ jobs: - name: Get pip cache dir id: pip-cache run: | - echo "::set-output name=dir::$(pip cache dir)" + echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT - name: pip cache uses: actions/cache@v2 @@ -382,7 +382,7 @@ jobs: - name: Get pip cache dir id: pip-cache run: | - echo "::set-output name=dir::$(pip cache dir)" + echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT - name: pip cache uses: actions/cache@v2 diff --git a/.meta.toml b/.meta.toml index 1ebe7bf..ae69747 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 = "b5df3766ff8923477f3d24729b19504f0c401a2e" +commit-id = "70229255d495a945324228b50ee735cc75e01430" [python] with-appveyor = true diff --git a/appveyor.yml b/appveyor.yml index 56c40ac..2e5a174 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,8 +26,8 @@ environment: - python: 310-x64 # `multibuild` cannot install non-final versions as they are not on # ftp.python.org, so we skip Python 3.11 until its final release: - # - python: 311 - # - python: 311-x64 + - python: 311 + - python: 311-x64 install: - "SET PYTHONVERSION=%PYTHON%"