From 4d4511b1eeabdc241715073385b5c50e6d2790bb Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 15 Oct 2026 08:45:56 +0000 Subject: [PATCH 1/4] Drop support for Python 3.10, 3.9. --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 302f76e..624d5ef 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,7 +5,7 @@ 6.1 (unreleased) ================ -- Nothing changed yet. +- Drop support for Python 3.10, 3.9. 6.0 (2025-09-12) From a254f57e080f5891df57e49b5511fa01aca64d32 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 15 Oct 2026 08:45:56 +0000 Subject: [PATCH 2/4] Add support for Python 3.14, 3.15. --- CHANGES.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 624d5ef..ae3f3ab 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,8 @@ 6.1 (unreleased) ================ +- Add support for Python 3.14, 3.15. + - Drop support for Python 3.10, 3.9. From 7573677bb09be7eebf571f6341aa7cd695af34b9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 15 Oct 2026 08:45:57 +0000 Subject: [PATCH 3/4] Configuring for pure-python --- .editorconfig | 8 +++--- .github/workflows/pre-commit.yml | 12 ++++---- .github/workflows/tests.yml | 49 ++++++++++++++++++++++++-------- .gitignore | 6 ++-- .meta.toml | 7 +++-- .pre-commit-config.yaml | 24 ++++++++++++---- CONTRIBUTING.md | 4 +-- MANIFEST.in | 4 +-- pyproject.toml | 8 ++---- setup.cfg | 5 ++-- tox.ini | 16 +++++------ 11 files changed, 91 insertions(+), 52 deletions(-) diff --git a/.editorconfig b/.editorconfig index c5508b9..e4b8673 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,8 +1,8 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/pure-python +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/pure-python # # EditorConfig Configuration file, for more details see: -# http://EditorConfig.org +# https://EditorConfig.org # EditorConfig is a convention description, that could be interpreted # by multiple editors to enforce common coding conventions for specific # file types @@ -12,7 +12,7 @@ root = true -[*] # For All Files +[*] # Unix-style newlines with a newline ending every file end_of_line = lf insert_final_newline = true diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index ff77ae6..f507fed 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -1,5 +1,5 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/pure-python +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/pure-python name: pre-commit on: @@ -21,16 +21,16 @@ jobs: name: linting runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 + - uses: actions/checkout@v7 + - uses: actions/setup-python@v7 with: - python-version: 3.x + python-version: '3.13' - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd #v3.0.1 with: extra_args: --all-files --show-diff-on-failure env: PRE_COMMIT_COLOR: always - - uses: pre-commit-ci/lite-action@5d6cc0eb514c891a40562a58a8e71576c5c7fb43 #v1.1.0 + - uses: pre-commit-ci/lite-action@062bca0919bc9d6e66755cc05074b70c77e111fc #v1.2.0 if: always() with: msg: Apply pre-commit code formatting diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index cfec5c9..a2cf802 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,5 +1,5 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/pure-python +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/pure-python name: tests on: @@ -24,39 +24,64 @@ jobs: config: # [Python version, tox env] - ["3.11", "release-check"] - - ["3.9", "py39"] - - ["3.10", "py310"] - ["3.11", "py311"] - ["3.12", "py312"] - ["3.13", "py313"] - - ["pypy-3.10", "pypy3"] + - ["3.14", "py314"] + - ["3.15", "py315"] + - ["pypy-3.11", "pypy3"] - ["3.11", "coverage"] 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.config[1] }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 with: persist-credentials: false - name: Install uv + caching - uses: astral-sh/setup-uv@v6 + # astral/setup-uv@10.3.0 + uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 with: enable-cache: true cache-dependency-glob: | setup.* tox.ini - python-version: ${{ matrix.matrix.config[0] }} + 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: | uvx coveralls --service=github env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Build package artifacts + if: > + matrix.os[0] == 'ubuntu' + && matrix.config[1] == 'py315' + run: | + rm -f dist/* + pip install -U packaging "setuptools >= 78.1.1,< 82" wheel twine + python setup.py sdist + python setup.py bdist_wheel + + - name: Upload package wheel + if: > + matrix.os[0] == 'ubuntu' + && matrix.config[1] == 'py315' + uses: actions/upload-artifact@v7 + with: + name: zope.securitypolicy.whl + path: dist/*whl + + - name: Upload package source distribution + if: > + matrix.os[0] == 'ubuntu' + && matrix.config[1] == 'py315' + uses: actions/upload-artifact@v7 + with: + name: zope.securitypolicy.tar.gz + path: dist/*gz diff --git a/.gitignore b/.gitignore index 1f321f5..a70575b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/pure-python +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/pure-python *.dll *.egg-info/ *.profraw @@ -12,6 +12,7 @@ .installed.cfg .mr.developer.cfg .tox/ +.venv .vscode/ __pycache__/ bin/ @@ -28,5 +29,6 @@ lib64 log/ parts/ pyvenv.cfg +share/ testing.log var/ diff --git a/.meta.toml b/.meta.toml index f5b0fc4..ef61a60 100644 --- a/.meta.toml +++ b/.meta.toml @@ -1,8 +1,8 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/pure-python +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/pure-python [meta] template = "pure-python" -commit-id = "d03bba5c" +commit-id = "f63da99d" [python] with-sphinx-doctests = false @@ -11,6 +11,7 @@ with-pypy = true with-macos = false with-windows = false with-docs = false +with-free-threaded-python = false [tox] use-flake8 = true diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ccdedc2..e184fd8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,9 +1,18 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/pure-python +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/pure-python minimum_pre_commit_version: '3.6' repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v6.0.0 + hooks: + - id: check-case-conflict + - id: check-merge-conflict + - id: check-toml + - id: check-yaml + - id: end-of-file-fixer + - id: trailing-whitespace - repo: https://github.com/pycqa/isort - rev: "6.0.1" + rev: "8.0.1" hooks: - id: isort - repo: https://github.com/hhatto/autopep8 @@ -12,17 +21,22 @@ repos: - id: autopep8 args: [--in-place, --aggressive, --aggressive] - repo: https://github.com/asottile/pyupgrade - rev: v3.20.0 + rev: v3.21.2 hooks: - id: pyupgrade - args: [--py39-plus] + args: [--py311-plus] - repo: https://github.com/isidentical/teyit rev: 0.4.3 hooks: - id: teyit + language_version: python3.13 - repo: https://github.com/PyCQA/flake8 rev: "7.3.0" hooks: - id: flake8 additional_dependencies: - flake8-debugger == 4.1.2 + - repo: https://github.com/sphinx-contrib/sphinx-lint + rev: v1.0.2 + hooks: + - id: sphinx-lint diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0ab12fe..ca517f4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Contributing to zopefoundation projects diff --git a/MANIFEST.in b/MANIFEST.in index 668651d..b340594 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,5 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/pure-python +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/pure-python include *.md include *.rst include *.txt diff --git a/pyproject.toml b/pyproject.toml index 05d7f0d..788d02e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,10 +1,8 @@ -# -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/pure-python - +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/pure-python [build-system] requires = [ - "setuptools == 78.1.1", + "setuptools >= 78.1.1,< 82", "wheel", ] build-backend = "setuptools.build_meta" diff --git a/setup.cfg b/setup.cfg index 064a6fe..9269c79 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,5 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/pure-python - +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/pure-python [flake8] doctests = 1 diff --git a/tox.ini b/tox.ini index 12edc3e..8d749ca 100644 --- a/tox.ini +++ b/tox.ini @@ -1,15 +1,15 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/pure-python +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/pure-python [tox] minversion = 3.18 envlist = release-check lint - py39 - py310 py311 py312 py313 + py314 + py315 pypy3 coverage @@ -18,7 +18,7 @@ usedevelop = true package = wheel wheel_build_env = .pkg deps = - setuptools == 78.1.1 + setuptools >= 78.1.1,< 82 commands = zope-testrunner --test-path=src {posargs:-vc} extras = @@ -34,17 +34,17 @@ description = ensure that the distribution is ready to release basepython = python3 skip_install = true deps = - setuptools == 78.1.1 + setuptools >= 78.1.1,< 82 wheel twine build check-manifest - check-python-versions >= 0.20.0 + check-python-versions >= 0.24.2 wheel commands_pre = commands = check-manifest - check-python-versions --only setup.py,tox.ini,.github/workflows/tests.yml + check-python-versions --only pyproject.toml,setup.py,tox.ini,.github/workflows/tests.yml python -m build --sdist --no-isolation twine check dist/* From caace249754783d4215f45f6098b22797ecc14c0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 15 Oct 2026 08:46:21 +0000 Subject: [PATCH 4/4] Update Python version support. --- COPYRIGHT.txt | 2 +- setup.py | 6 +++--- src/zope/securitypolicy/tests/role.zcml | 2 +- src/zope/securitypolicy/zopepolicy.txt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt index 79859e0..b8581dd 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -1 +1 @@ -Zope Foundation and Contributors \ No newline at end of file +Zope Foundation and Contributors diff --git a/setup.py b/setup.py index 30cb9f8..bd9bfe4 100644 --- a/setup.py +++ b/setup.py @@ -48,11 +48,11 @@ def read(*rnames): 'License :: OSI Approved :: Zope Public License', 'Programming Language :: Python', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', 'Programming Language :: Python :: 3.12', 'Programming Language :: Python :: 3.13', + 'Programming Language :: Python :: 3.14', + 'Programming Language :: Python :: 3.15', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', 'Natural Language :: English', @@ -62,7 +62,7 @@ def read(*rnames): ], url='https://github.com/zopefoundation/zope.securitypolicy', license='ZPL-2.1', - python_requires='>=3.9', + python_requires='>=3.11', install_requires=[ 'persistent', 'setuptools', diff --git a/src/zope/securitypolicy/tests/role.zcml b/src/zope/securitypolicy/tests/role.zcml index 9d0a0fd..e6e46b2 100644 --- a/src/zope/securitypolicy/tests/role.zcml +++ b/src/zope/securitypolicy/tests/role.zcml @@ -10,5 +10,5 @@ title="Tout le monde" description="The common man, woman, person, or thing" /> - + diff --git a/src/zope/securitypolicy/zopepolicy.txt b/src/zope/securitypolicy/zopepolicy.txt index a10b60a..6376362 100644 --- a/src/zope/securitypolicy/zopepolicy.txt +++ b/src/zope/securitypolicy/zopepolicy.txt @@ -83,7 +83,7 @@ Note, however, that we always have the CheckerPublic permission: True We make grants and denials on objects by adapting them to various -granting interfaces. The objects returned from the adaptation are +granting interfaces. The objects returned from the adaptation are object-specific manager objects: >>> from zope.securitypolicy import interfaces