Merge pull request cherrypy#810 from mr-c/ci/py3.14.0-final

webknjaz · julianz- · commit 0d810085540d · 2026-02-24T16:14:30.000-08:00
tests: silence a Python 3.14 specific warning; Mark Python 3.14 as being officially supported.
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -728,6 +728,7 @@ jobs:
         # NOTE: The latest and the lowest supported Pythons are prioritized
         # NOTE: to improve the responsiveness. It's nice to see the most
         # NOTE: important results first.
+        - 3.14
         - 3.13
         - 3.8
         - pypy-3.11
@@ -736,7 +737,7 @@ jobs:
         - >-
           3.10
         - 3.9
-        - ~3.14.0-0
+        - ~3.15.0-0
         runner-vm-os:
         - ubuntu-24.04-arm
         - ubuntu-24.04
diff --git a/.github/workflows/pip-tools.yml b/.github/workflows/pip-tools.yml
@@ -58,6 +58,7 @@ jobs:
         # NOTE: The latest and the lowest supported Pythons are prioritized
         # NOTE: to improve the responsiveness. It's nice to see the most
         # NOTE: important results first.
+        - 3.14
         - 3.13
         - 3.8
         - pypy-3.11
@@ -66,7 +67,7 @@ jobs:
         - >-
           3.10
         - 3.9
-        - ~3.14.0-0
+        - ~3.15.0-0
         os:
         - ubuntu-24.04-arm
         - macOS-15  # arm64
diff --git a/README.rst b/README.rst
@@ -77,11 +77,13 @@ For Enterprise
 
 .. _Tidelift Subscription: https://tidelift.com/subscription/pkg/pypi-cheroot?utm_source=pypi-cheroot&utm_medium=referral&utm_campaign=readme
 
-.. |tideliftlogo| image:: https://cdn2.hubspot.net/hubfs/4008838/website/logos/logos_for_download/Tidelift_primary-shorthand-logo.png
+.. |tideliftlogo| image:: https://tidelift.com/badges/package/pypi/cheroot
    :target: https://tidelift.com/subscription/pkg/pypi-cheroot?utm_source=pypi-cheroot&utm_medium=readme
    :width: 75
    :alt: Tidelift
 
+   
+
 Contribute Cheroot
 ==================
 **Want to add something to upstream?** Feel free to submit a PR or file an issue
diff --git a/dependencies/tox-docs.in b/dependencies/tox-docs.in
@@ -3,6 +3,7 @@
 
 Sphinx >= 1.8.2
 jaraco.packaging >= 9  # first version to load meta through PEP 517 interface
+jaraco.tidelift
 sphinx-tabs >= 1.1.0
 
 furo
diff --git a/docs/changelog-fragments.d/767.contrib.rst b/docs/changelog-fragments.d/767.contrib.rst
@@ -0,0 +1,3 @@
+Tests: copied and adapted Python 3.13 filter warning for Python 3.14, to match
+the new syntax
+-- by :user:`mr-c`.
diff --git a/docs/changelog-fragments.d/767.packaging.rst b/docs/changelog-fragments.d/767.packaging.rst
@@ -0,0 +1,2 @@
+Declared Python version 3.14 as officially supported
+-- by :user:`mr-c`.
diff --git a/docs/changelog-fragments.d/810.contrib.rst b/docs/changelog-fragments.d/810.contrib.rst
@@ -0,0 +1 @@
+767.contrib.rst
diff --git a/docs/conf.py b/docs/conf.py
@@ -34,6 +34,7 @@
     'sphinx.ext.doctest',
     'sphinx.ext.intersphinx',
     # Third-party extensions:
+    'jaraco.tidelift',  # provides `.. tidelift::` directive
     'jaraco.packaging.sphinx',
     'sphinx_issues',  # implements `:issue:`, `:pr:` and other GH-related roles
     'sphinx_tabs.tabs',
@@ -43,6 +44,10 @@
     'spelling_stub_ext',  # auto-loads `sphinxcontrib.spelling` if installed
 ]
 
+suppress_warnings = [
+    'parallel-read-safe',
+]
+
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
@@ -85,7 +90,7 @@
     'ddt': ('https://ddt.readthedocs.io/en/latest/', None),
     'pyopenssl': ('https://www.pyopenssl.org/en/latest/', None),
     'towncrier': ('https://towncrier.readthedocs.io/en/latest/', None),
-    'sphinx': ('https://www.sphinx-doc.org', None),
+    'sphinx': ('https://www.sphinx-doc.org/en/master', None),
 }
 
 linkcheck_ignore = [
diff --git a/pyproject.toml b/pyproject.toml
@@ -29,6 +29,7 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
   "Programming Language :: Python :: Implementation",
   "Programming Language :: Python :: Implementation :: CPython",
   "Programming Language :: Python :: Implementation :: Jython",
@@ -77,6 +78,7 @@ docs = [
   "sphinx >= 1.8.2",
   "jaraco.packaging >= 3.2",
   "sphinx-tabs >= 1.1.0",
+  "jaraco.tidelift >= 1.4",
 
   # local
   "furo",
diff --git a/pytest.ini b/pytest.ini
@@ -61,6 +61,8 @@ filterwarnings =
   # FIXME: which exposed a possible race condition in test_conn test cleanup.
   # Ref: https://github.com/cherrypy/cheroot/issues/734
   ignore:Exception ignored in. <function IOBase.__del__:pytest.PytestUnraisableExceptionWarning
+  # Python 3.14 version of the above
+  ignore:Exception ignored while calling deallocator <function IOBase.__del__ at:pytest.PytestUnraisableExceptionWarning
 
 # https://docs.pytest.org/en/stable/usage.html#creating-junitxml-format-files
 junit_duration_report = call
diff --git a/tox.ini b/tox.ini
@@ -541,6 +541,7 @@ depends =
 deps =
   setuptools-scm
   twine
+  jaraco.tidelift
 use_develop = false
 skip_install = true
 commands_pre =

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+Tests: copied and adapted Python 3.13 filter warning for Python 3.14, to match`
	`2`	`+the new syntax`
	`3`	+-- by :user:`mr-c`.
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Declared Python version 3.14 as officially supported`
	`2`	+-- by :user:`mr-c`.