From 87e7912bfcb28b6ac8e6a0fe2d280ca6c9c09a2f Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Mon, 6 Nov 2023 08:26:51 +0100 Subject: [PATCH] Test on Python 3.13a1. Update to a RestrictedPython version which can be installed on Python 3.13. --- .github/workflows/tests.yml | 5 +++++ .meta.toml | 4 ++-- constraints.txt | 2 +- requirements-full.txt | 2 +- tox.ini | 1 + versions-prod.cfg | 12 ++++++------ 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8e16bcebb8..f5a2476b22 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,6 +22,7 @@ jobs: - ["macos", "macos-11"] config: # [Python version, tox env] + - ["3.9", "release-check"] - ["3.9", "lint"] - ["3.7", "py37"] - ["3.8", "py38"] @@ -29,12 +30,15 @@ jobs: - ["3.10", "py310"] - ["3.11", "py311"] - ["3.12", "py312"] + - ["3.13.0-alpha - 3.13.0", "py313"] - ["3.9", "docs"] - ["3.9", "coverage"] exclude: + - { os: ["windows", "windows-latest"], config: ["3.9", "release-check"] } - { os: ["windows", "windows-latest"], config: ["3.9", "lint"] } - { os: ["windows", "windows-latest"], config: ["3.9", "docs"] } - { os: ["windows", "windows-latest"], config: ["3.9", "coverage"] } + - { os: ["macos", "macos-11"], config: ["3.9", "release-check"] } - { os: ["macos", "macos-11"], config: ["3.9", "lint"] } - { os: ["macos", "macos-11"], config: ["3.9", "docs"] } - { os: ["macos", "macos-11"], config: ["3.9", "coverage"] } @@ -42,6 +46,7 @@ jobs: # which causes build and package selection issues. - { os: ["macos", "macos-11"], config: ["3.11", "py311"] } - { os: ["macos", "macos-11"], config: ["3.12", "py312"] } + - { os: ["macos", "macos-11"], config: ["3.13.0-alpha - 3.13.0", "py313"] } 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 diff --git a/.meta.toml b/.meta.toml index f758761852..046492d4ec 100644 --- a/.meta.toml +++ b/.meta.toml @@ -2,7 +2,7 @@ # https://github.com/zopefoundation/meta/tree/master/config/zope-product [meta] template = "zope-product" -commit-id = "13b9049c" +commit-id = "6f8d8c51" [python] with-pypy = false @@ -10,7 +10,7 @@ with-docs = true with-sphinx-doctests = false with-windows = true with-macos = true -with-future-python = false +with-future-python = true [coverage] fail-under = 80 diff --git a/constraints.txt b/constraints.txt index 2d3031f0fe..4a88b3fb41 100644 --- a/constraints.txt +++ b/constraints.txt @@ -16,7 +16,7 @@ RestrictedPython==6.2; python_version == '3.11' RestrictedPython==6.2; python_version == '3.7' RestrictedPython==6.2; python_version == '3.8' RestrictedPython==6.2; python_version == '3.9' -RestrictedPython==7.0a1.dev1; python_version > '3.11' +RestrictedPython==7.0a2.dev0; python_version > '3.11' WSGIProxy2==0.5.1 WebOb==1.8.7 WebTest==3.0.0 diff --git a/requirements-full.txt b/requirements-full.txt index 79409ebc8f..ab8e7ee40f 100644 --- a/requirements-full.txt +++ b/requirements-full.txt @@ -17,7 +17,7 @@ RestrictedPython==6.2; python_version == '3.11' RestrictedPython==6.2; python_version == '3.7' RestrictedPython==6.2; python_version == '3.8' RestrictedPython==6.2; python_version == '3.9' -RestrictedPython==7.0a1.dev1; python_version > '3.11' +RestrictedPython==7.0a2.dev0; python_version > '3.11' WSGIProxy2==0.5.1 WebOb==1.8.7 WebTest==3.0.0 diff --git a/tox.ini b/tox.ini index e54db0e12a..c56dfd8bfd 100644 --- a/tox.ini +++ b/tox.ini @@ -11,6 +11,7 @@ envlist = py310 py311 py312 + py313 docs coverage pre-commit diff --git a/versions-prod.cfg b/versions-prod.cfg index 59c4ae7e26..f818ec7112 100644 --- a/versions-prod.cfg +++ b/versions-prod.cfg @@ -16,7 +16,7 @@ MultiMapping = 5.0 Paste = 3.6.0 PasteDeploy = 3.0.1 Persistence = 4.1 -RestrictedPython = 7.0a1.dev1 +RestrictedPython = 7.0a2.dev0 WebTest = 3.0.0 WSGIProxy2 = 0.5.1 WebOb = 1.8.7 @@ -87,23 +87,23 @@ zope.viewlet = 5.0 PasteDeploy = 2.1.1 # SoupSieve 2.5 and up requires Python 3.8 soupsieve = 2.4.1 -# Only use dev version on Python 3.12 +# Only use dev version on Python 3.12 + 3.13 RestrictedPython = 6.2 # cffi 1.16.0 requires Python 3.8 cffi = 1.15.1 [versions:python38] -# Only use dev version on Python 3.12 +# Only use dev version on Python 3.12 + 3.13 RestrictedPython = 6.2 [versions:python39] -# Only use dev version on Python 3.12 +# Only use dev version on Python 3.12 + 3.13 RestrictedPython = 6.2 [versions:python310] -# Only use dev version on Python 3.12 +# Only use dev version on Python 3.12 + 3.13 RestrictedPython = 6.2 [versions:python311] -# Only use dev version on Python 3.12 +# Only use dev version on Python 3.12 + 3.13 RestrictedPython = 6.2