From 738db73a9b44c182b5b978dec6d5c24132a35369 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Fri, 16 Feb 2024 09:10:01 +0100 Subject: [PATCH] Preliminary support for Python 3.13a3 (#143) * Replace deprecated `logging.warn` with `logging.warning`. --- .github/workflows/tests.yml | 78 ++++++++++++++++++++++------- .manylinux-install.sh | 11 +++- .meta.toml | 4 +- CHANGES.rst | 2 +- appveyor.yml | 3 ++ src/AccessControl/SecurityInfo.py | 15 +++--- src/AccessControl/cAccessControl.c | 2 +- src/AccessControl/logger_wrapper.py | 2 +- tox.ini | 5 +- 9 files changed, 89 insertions(+), 33 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b9b7c19..b62ce97 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -102,13 +102,14 @@ jobs: - "3.10" - "3.11" - "3.12" + - "3.13.0-alpha - 3.13.0" os: [ubuntu-20.04, macos-11] steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} ### @@ -123,14 +124,24 @@ jobs: echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT - name: pip cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} key: ${{ runner.os }}-pip-${{ matrix.python-version }} restore-keys: | ${{ runner.os }}-pip- + - name: Install Build Dependencies (3.13.0-alpha - 3.13.0) + if: matrix.python-version == '3.13.0-alpha - 3.13.0' + run: | + pip install -U pip + pip install -U setuptools wheel twine + # cffi will probably have no public release until a Python 3.13 beta + # or even RC release, see https://github.com/python-cffi/cffi/issues/23 + echo "cffi @ git+https://github.com/python-cffi/cffi.git@954cab4f889fb019a7f90df153ee1be501495f58" > cffi_constraint.txt + PIP_CONSTRAINT=cffi_constraint.txt pip install cffi - name: Install Build Dependencies + if: matrix.python-version != '3.13.0-alpha - 3.13.0' run: | pip install -U pip pip install -U setuptools wheel twine cffi @@ -174,7 +185,18 @@ jobs: python setup.py build_ext -i python setup.py bdist_wheel + - name: Install AccessControl and dependencies (3.13.0-alpha - 3.13.0) + if: matrix.python-version == '3.13.0-alpha - 3.13.0' + run: | + # Install to collect dependencies into the (pip) cache. + # cffi will probably have no public release until a Python 3.13 beta + # or even RC release, see https://github.com/python-cffi/cffi/issues/23 + echo "cffi @ git+https://github.com/python-cffi/cffi.git@954cab4f889fb019a7f90df153ee1be501495f58" > cffi_constraint.txt + # Use "--pre" here because dependencies with support for this future + # Python release may only be available as pre-releases + PIP_CONSTRAINT=cffi_constraint.txt pip install --pre .[test] - name: Install AccessControl and dependencies + if: matrix.python-version != '3.13.0-alpha - 3.13.0' run: | # Install to collect dependencies into the (pip) cache. pip install .[test] @@ -186,7 +208,7 @@ jobs: - name: Upload AccessControl wheel (macOS x86_64) if: > startsWith(runner.os, 'Mac') - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: AccessControl-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/*x86_64.whl @@ -195,7 +217,7 @@ jobs: startsWith(runner.os, 'Mac') && !(startsWith(matrix.python-version, 'pypy') || matrix.python-version == '3.7') - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: # The arm64 wheel is uploaded with a different name just so it can be # manually downloaded when desired. The wheel itself *cannot* be tested @@ -205,7 +227,7 @@ jobs: - name: Upload AccessControl wheel (all other platforms) if: > !startsWith(runner.os, 'Mac') - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: AccessControl-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/*whl @@ -218,6 +240,7 @@ jobs: && startsWith(github.ref, 'refs/tags') && startsWith(runner.os, 'Mac') && !startsWith(matrix.python-version, 'pypy') + && !startsWith(matrix.python-version, '3.13.0-alpha - 3.13.0') env: TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }} run: | @@ -236,13 +259,14 @@ jobs: - "3.10" - "3.11" - "3.12" + - "3.13.0-alpha - 3.13.0" os: [ubuntu-20.04, macos-11] steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} ### @@ -257,7 +281,7 @@ jobs: echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT - name: pip cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} key: ${{ runner.os }}-pip-${{ matrix.python-version }} @@ -265,11 +289,29 @@ jobs: ${{ runner.os }}-pip- - name: Download AccessControl wheel - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: AccessControl-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/ + - name: Install AccessControl 3.13.0-alpha - 3.13.0 + if: ${{ startsWith(matrix.python-version, '3.13.0-alpha - 3.13.0') }} + run: | + pip install -U wheel setuptools + # cffi will probably have no public release until a beta or even RC + # version of Python 3.13, see https://github.com/python-cffi/cffi/issues/23 + echo 'cffi @ git+https://github.com/python-cffi/cffi.git@954cab4f889fb019a7f90df153ee1be501495f58 ; platform_python_implementation == "CPython"' > cffi_constraint.txt + # coverage has 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 + # 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/AccessControl-*whl -d src + # Use "--pre" here because dependencies with support for this future + # Python release may only be available as pre-releases + PIP_CONSTRAINT=cffi_constraint.txt pip install --pre -U -e .[test] - name: Install AccessControl + if: ${{ !startsWith(matrix.python-version, '3.13.0-alpha - 3.13.0') }} run: | pip install -U wheel setuptools pip install -U coverage @@ -317,9 +359,9 @@ jobs: steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} ### @@ -334,7 +376,7 @@ jobs: echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT - name: pip cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} key: ${{ runner.os }}-pip-${{ matrix.python-version }} @@ -342,7 +384,7 @@ jobs: ${{ runner.os }}-pip- - name: Download AccessControl wheel - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: AccessControl-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/ @@ -370,9 +412,9 @@ jobs: steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} ### @@ -387,7 +429,7 @@ jobs: echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT - name: pip cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} key: ${{ runner.os }}-pip_manylinux-${{ matrix.image }}-${{ matrix.python-version }} @@ -422,7 +464,7 @@ jobs: bash .manylinux.sh - name: Upload AccessControl wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: wheelhouse/*whl name: manylinux_${{ matrix.image }}_wheels.zip diff --git a/.manylinux-install.sh b/.manylinux-install.sh index c2fbd1f..6eadd25 100755 --- a/.manylinux-install.sh +++ b/.manylinux-install.sh @@ -28,6 +28,7 @@ yum -y install libffi-devel tox_env_map() { case $1 in + *"cp313"*) echo 'py313';; *"cp37"*) echo 'py37';; *"cp38"*) echo 'py38';; *"cp39"*) echo 'py39';; @@ -41,14 +42,20 @@ tox_env_map() { # Compile wheels for PYBIN in /opt/python/*/bin; do if \ + [[ "${PYBIN}" == *"cp313"* ]] || \ [[ "${PYBIN}" == *"cp311"* ]] || \ [[ "${PYBIN}" == *"cp312"* ]] || \ [[ "${PYBIN}" == *"cp37"* ]] || \ [[ "${PYBIN}" == *"cp38"* ]] || \ [[ "${PYBIN}" == *"cp39"* ]] || \ [[ "${PYBIN}" == *"cp310"* ]] ; then - "${PYBIN}/pip" install -e /io/ - "${PYBIN}/pip" wheel /io/ -w wheelhouse/ + if [[ "${PYBIN}" == *"cp313"* ]] ; then + "${PYBIN}/pip" install --pre -e /io/ + "${PYBIN}/pip" wheel /io/ --pre -w wheelhouse/ + else + "${PYBIN}/pip" install -e /io/ + "${PYBIN}/pip" wheel /io/ -w wheelhouse/ + fi if [ `uname -m` == 'aarch64' ]; then cd /io/ ${PYBIN}/pip install tox diff --git a/.meta.toml b/.meta.toml index f602d9f..145039a 100644 --- a/.meta.toml +++ b/.meta.toml @@ -2,13 +2,13 @@ # https://github.com/zopefoundation/meta/tree/master/config/c-code [meta] template = "c-code" -commit-id = "cb0568c7" +commit-id = "fc37b50c" [python] with-appveyor = true with-windows = false with-pypy = false -with-future-python = false +with-future-python = true with-sphinx-doctests = false with-macos = false diff --git a/CHANGES.rst b/CHANGES.rst index f35a8d2..bc67a8d 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -6,7 +6,7 @@ For changes before version 3.0, see ``HISTORY.rst``. 6.4 (unreleased) ---------------- -- Nothing changed yet. +- Add preliminary support for Python 3.13 as of 3.13a3. 6.3 (2023-11-20) diff --git a/appveyor.yml b/appveyor.yml index c52887a..b866ab6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,6 +16,9 @@ environment: - python: 310-x64 - python: 311-x64 - python: 312-x64 + # `multibuild` cannot install non-final versions as they are not on + # ftp.python.org, so we skip Python 3.13 until its final release: + # - python: 313-x64 install: - "SET PYTHONVERSION=%PYTHON%" diff --git a/src/AccessControl/SecurityInfo.py b/src/AccessControl/SecurityInfo.py index ed87984..a025d8a 100644 --- a/src/AccessControl/SecurityInfo.py +++ b/src/AccessControl/SecurityInfo.py @@ -78,7 +78,8 @@ def __init__(self): def _setaccess(self, names, access): for name in names: if self.names.get(name, access) != access: - LOG.warn('Conflicting security declarations for "%s"' % name) + LOG.warning( + f'Conflicting security declarations for {name!r}') self._warnings = 1 self.names[name] = access @@ -159,8 +160,8 @@ def setPermissionDefault(self, permission_name, roles): for role in roles: rdict[role] = 1 if self.roles.get(permission_name, rdict) != rdict: - LOG.warn('Conflicting default role' - 'declarations for permission "%s"' % permission_name) + LOG.warning('Conflicting default role' + ' declarations for permission "%s"' % permission_name) self._warnings = 1 self.roles[permission_name] = rdict @@ -248,8 +249,8 @@ def apply(self, classobj): access) if getattr(self, '_warnings', None): - LOG.warn('Class "%s" had conflicting ' - 'security declarations' % classobj.__name__) + LOG.warning('Class "%s" had conflicting' + ' security declarations' % classobj.__name__) class ClassSecurityInformation(ClassSecurityInfo): @@ -343,8 +344,8 @@ def apply(self, dict): dict['__allow_access_to_unprotected_subobjects__'] = self if getattr(self, '_warnings', None): - LOG.warn('Module "%s" had conflicting ' - 'security declarations' % dict['__name__']) + LOG.warning('Module "%s" had conflicting' + ' security declarations' % dict['__name__']) declareProtected__roles__ = ACCESS_PRIVATE diff --git a/src/AccessControl/cAccessControl.c b/src/AccessControl/cAccessControl.c index 33e763b..f733585 100644 --- a/src/AccessControl/cAccessControl.c +++ b/src/AccessControl/cAccessControl.c @@ -1071,7 +1071,7 @@ static PyObject *ZopeSecurityPolicy_validate(PyObject *self, PyObject *args) { **| try: **| if roles is None or 'Anonymous' in roles: return 1 **| except TypeError: - **| LOG.warn('"%s' passed as roles" + **| LOG.warning('"%s' passed as roles" **| " during validation of '%s' is not a sequence." % **| ('roles', name)) **| raise diff --git a/src/AccessControl/logger_wrapper.py b/src/AccessControl/logger_wrapper.py index bf1e6ab..8f3c809 100644 --- a/src/AccessControl/logger_wrapper.py +++ b/src/AccessControl/logger_wrapper.py @@ -5,4 +5,4 @@ LOG = getLogger('AccessControl') -warn = LOG.warn +warn = LOG.warning diff --git a/tox.ini b/tox.ini index 0ee6c1c..05ba95c 100644 --- a/tox.ini +++ b/tox.ini @@ -10,10 +10,12 @@ envlist = py310,py310-pure py311,py311-pure py312,py312-pure + py313,py313-pure coverage [testenv] usedevelop = true +pip_pre = py313: true deps = setenv = pure: PURE_PYTHON=1 @@ -48,9 +50,10 @@ deps = check-manifest check-python-versions >= 0.20.0 wheel +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/*