From 8ea78c6ae81994fccadcced8d3e8b96ed2316a76 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Thu, 28 May 2026 08:55:52 +0200 Subject: [PATCH 1/3] Configuring for pure-python --- .github/workflows/tests.yml | 29 +++++++++++++++++++++++++++++ .meta.toml | 2 +- pyproject.toml | 3 +-- setup.cfg | 1 - tox.ini | 4 ++-- 5 files changed, 33 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c458fa5..7b6d25b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -63,3 +63,32 @@ jobs: uvx coveralls --service=github env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Build package artifacts + if: > + matrix.os[0] == 'ubuntu' + && matrix.config[1] == 'py314' + 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] == 'py314' + uses: actions/upload-artifact@v7 + with: + name: RestrictedPython.whl + path: dist/*whl + + - name: Upload package source distribution + if: > + matrix.os[0] == 'ubuntu' + && matrix.config[1] == 'py314' + uses: actions/upload-artifact@v7 + with: + name: RestrictedPython.tar.gz + path: dist/*gz + diff --git a/.meta.toml b/.meta.toml index 32f5cc5..ff69dca 100644 --- a/.meta.toml +++ b/.meta.toml @@ -2,7 +2,7 @@ # https://github.com/zopefoundation/meta/tree/master/src/zope/meta/pure-python [meta] template = "pure-python" -commit-id = "ba10c93f" +commit-id = "fee4a500" [python] with-pypy = false diff --git a/pyproject.toml b/pyproject.toml index c66658e..53f22fd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,12 +2,11 @@ # https://github.com/zopefoundation/meta/tree/master/src/zope/meta/pure-python [build-system] requires = [ - "setuptools >= 78.1.1,< 81", + "setuptools >= 78.1.1,< 82", "wheel", ] build-backend = "setuptools.build_meta" - [project] name = "RestrictedPython" version = "8.2.dev0" diff --git a/setup.cfg b/setup.cfg index 3b11c8e..f3bdfd7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,5 @@ # 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 3439cf4..7144431 100644 --- a/tox.ini +++ b/tox.ini @@ -20,7 +20,7 @@ usedevelop = true package = wheel wheel_build_env = .pkg deps = - setuptools >= 78.1.1,< 81 + setuptools >= 78.1.1,< 82 datetime: DateTime -cconstraints.txt pytest-cov @@ -64,7 +64,7 @@ description = ensure that the distribution is ready to release basepython = python3 skip_install = true deps = - setuptools >= 78.1.1,< 81 + setuptools >= 78.1.1,< 82 wheel twine build From 8236c90c47c95fc7a5221bd9fe5447a292e70661 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Thu, 28 May 2026 09:56:56 +0200 Subject: [PATCH 2/3] Preliminary not security tested support for Python 3.15. --- .github/workflows/tests.yml | 1 + .meta.toml | 4 ++-- CHANGES.rst | 2 ++ pyproject.toml | 2 +- tox.ini | 2 ++ 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7b6d25b..2b54262 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -30,6 +30,7 @@ jobs: - ["3.12", "py312"] - ["3.13", "py313"] - ["3.14", "py314"] + - ["3.15", "py315"] - ["3.11", "docs"] - ["3.11", "coverage"] - ["3.11", "py311-datetime"] diff --git a/.meta.toml b/.meta.toml index ff69dca..f38ac04 100644 --- a/.meta.toml +++ b/.meta.toml @@ -2,14 +2,14 @@ # https://github.com/zopefoundation/meta/tree/master/src/zope/meta/pure-python [meta] template = "pure-python" -commit-id = "fee4a500" +commit-id = "516c594a" [python] with-pypy = false with-docs = true with-sphinx-doctests = true with-windows = true -with-future-python = false +with-future-python = true with-macos = false with-free-threaded-python = false diff --git a/CHANGES.rst b/CHANGES.rst index 34de237..5c3b43c 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,8 @@ Changes 8.2 (unreleased) ---------------- +- Preliminary not security tested support for Python 3.15. + - Remove documentation that appears to promote unsupported direct guards usage. - Move package metadata from setup.py to pyproject.toml. diff --git a/pyproject.toml b/pyproject.toml index 53f22fd..7646c29 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,7 @@ classifiers = [ "Topic :: Security", ] dynamic = ["readme"] -requires-python = ">=3.10, <3.15" +requires-python = ">=3.10, <3.16" authors = [ {name = "Zope Foundation and contributors",email = "zope-dev@zope.dev"}, ] diff --git a/tox.ini b/tox.ini index 7144431..2cd39fd 100644 --- a/tox.ini +++ b/tox.ini @@ -10,6 +10,7 @@ envlist = py312 py313 py314 + py315 docs coverage py311-datetime @@ -19,6 +20,7 @@ envlist = usedevelop = true package = wheel wheel_build_env = .pkg +pip_pre = py315: true deps = setuptools >= 78.1.1,< 82 datetime: DateTime From 810974014f2f88ba812db4ed878fea49b565e0c1 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Fri, 29 May 2026 08:31:01 +0200 Subject: [PATCH 3/3] Revise Python 3.15 support statement in CHANGES.rst Updated Python 3.15 support note with caution about security audit. --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index dd3d12c..e7dcb5a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,7 +4,7 @@ Changes 8.3 (unreleased) ---------------- -- Preliminary not security tested support for Python 3.15. +- Allow to use the package with Python 3.15 -- Caution: No security audit has been done so far. 8.2 (2026-05-29)