Skip to content

Commit 011030f

Browse files
icemacdataflake
andauthored
Add preliminary support for Python 3.14 (#1257)
* Configuring for zope-product * Update requirements. * Use Python 3.14 compatible version of z3c.pt. * Fix usage of deprecated `ast.Str` in Zope itself. * - no longer need to get z3c.pt from git * - use final RestrictedPython 8.1 * - fix trove classifiers * - Python 3.14 is no longer the future Python. * - use fixed ZConfig and auto-generate docs version numbers * - one laste zope.meta run --------- Co-authored-by: Jens Vagelpohl <jens@plyp.com>
1 parent 84ab9a6 commit 011030f

File tree

10 files changed

+21
-17
lines changed

10 files changed

+21
-17
lines changed

.github/workflows/tests.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
- ["3.11", "py311"]
3131
- ["3.12", "py312"]
3232
- ["3.13", "py313"]
33+
- ["3.14", "py314"]
3334
- ["3.11", "docs"]
3435
- ["3.11", "coverage"]
3536
exclude:
@@ -48,8 +49,8 @@ jobs:
4849
with:
4950
persist-credentials: false
5051
- name: Install uv + caching
51-
# astral/setup-uv@7.1.2
52-
uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41
52+
# astral/setup-uv@7.1.3
53+
uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3
5354
with:
5455
enable-cache: true
5556
cache-dependency-glob: |

.meta.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# https://github.com/zopefoundation/meta/tree/master/config/zope-product
33
[meta]
44
template = "zope-product"
5-
commit-id = "ad3bfb10"
5+
commit-id = "9fcd3d67"
66

77
[python]
88
with-pypy = false

constraints.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Sphinx==8.2.3; python_version > '3.10'
2525
WSGIProxy2==0.5.1
2626
WebOb==1.8.9
2727
WebTest==3.0.7
28-
ZConfig==4.2
28+
ZConfig==4.3
2929
ZODB==6.1
3030
Zope2==4.0
3131
accessible-pygments==0.0.5

docs/conf.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,24 @@
1515
# import sys
1616
# sys.path.insert(0, os.path.abspath('.'))
1717
import datetime
18+
import os
19+
import sys
20+
from importlib.metadata import distribution
1821

1922

2023
# -- Project information -----------------------------------------------------
2124
year = datetime.datetime.now().year
25+
sys.path.append(os.path.abspath('../src'))
26+
rqmt = distribution('Zope')
2227

2328
project = 'Zope'
24-
copyright = '2009-%s, The Zope developer community' % year
29+
copyright = f'2009-{year}, The Zope developer community'
2530
author = 'The Zope developer community'
2631

2732
# The short X.Y version
28-
version = '5.13'
33+
version = '%s.%s' % tuple(map(int, rqmt.version.split('.')[:2]))
2934
# The full version, including alpha/beta/rc tags
30-
release = '5.13'
35+
release = rqmt.version
3136

3237

3338
# -- General configuration ---------------------------------------------------

docs/maintenance.rst

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,7 @@ Steps for creating a new Zope release
4848

4949
or
5050

51-
$ vi CHANGES.rst setup.py
52-
53-
- Update the version information in the Sphinx documentation configuration::
54-
55-
$ vim docs/conf.py
51+
$ vim CHANGES.rst setup.py
5652

5753
- Pin the Zope version in ``versions-prod.cfg``.
5854

@@ -86,11 +82,11 @@ Steps for creating a new Zope release
8682

8783
or
8884

89-
$ vi CHANGES.rst setup.py
85+
$ vim CHANGES.rst setup.py
9086

9187
- Remove the version pin for Zope::
9288

93-
$ vi versions-prod.cfg (remove Zope pin)
89+
$ vim versions-prod.cfg (remove Zope pin)
9490
$ bin/buildout
9591

9692
- Commit and push the changes.

requirements-full.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RestrictedPython==8.1
1515
WSGIProxy2==0.5.1
1616
WebOb==1.8.9
1717
WebTest==3.0.7
18-
ZConfig==4.2
18+
ZConfig==4.3
1919
ZODB==6.1
2020
Zope2==4.0
2121
beautifulsoup4==4.14.2

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ def _read_file(filename):
5757
"Programming Language :: Python :: 3.11",
5858
"Programming Language :: Python :: 3.12",
5959
"Programming Language :: Python :: 3.13",
60+
"Programming Language :: Python :: 3.14",
6061
"Programming Language :: Python :: Implementation :: CPython",
6162
"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
6263
"Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
@@ -78,7 +79,6 @@ def _read_file(filename):
7879
'ZConfig >= 2.9.2',
7980
'ZODB',
8081
'multipart',
81-
'setuptools >= 36.2',
8282
'transaction >= 2.4',
8383
'waitress',
8484
'zExceptions >= 3.4',

sources.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ RestrictedPython = git ${remotes:github}/RestrictedPython pushurl=${remotes:gith
1717
zExceptions = git ${remotes:github}/zExceptions pushurl=${remotes:github_push}/zExceptions
1818
zope.globalrequest = git ${remotes:github}/zope.globalrequest pushurl=${remotes:github_push}/zope.globalrequest
1919
ZODB = git ${remotes:github}/ZODB pushurl=${remotes:github_push}/ZODB
20+
z3c.pt = git ${remotes:github}/z3c.pt pushurl=${remotes:github_push}/z3c.pt
2021

2122
# Optional dependencies
2223
five.localsitemanager = git ${remotes:github}/five.localsitemanager pushurl=${remotes:github_push}/five.localsitemanager

tox.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ envlist =
99
py311
1010
py312
1111
py313
12+
py314
1213
docs
1314
coverage
1415

versions-prod.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RestrictedPython = 8.1
2222
WebTest = 3.0.7
2323
WSGIProxy2 = 0.5.1
2424
WebOb = 1.8.9
25-
ZConfig = 4.2
25+
ZConfig = 4.3
2626
ZODB = 6.1
2727
beautifulsoup4 = 4.14.2
2828
cffi = 2.0.0

0 commit comments

Comments
 (0)