Skip to content

Commit 5a6fbf7

Browse files
committed
Merge branch 'maintenance/py3.14+py3.13-official-support' into devel
PR ansible#825
2 parents 2057ae9 + f3cf31b commit 5a6fbf7

10 files changed

Lines changed: 24 additions & 1 deletion

File tree

.coveragerc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ show_missing = true
2727
2828
[run]
2929
branch = true
30+
# NOTE: `ctrace` tracing method is needed because the `sysmon` tracer
31+
# NOTE: which is default on Python 3.14, causes unprecedented slow-down
32+
# NOTE: of the test runs. Also, Cython plugins do not support it.
33+
# Ref: https://github.com/coveragepy/coveragepy/issues/2099
34+
core = ctrace
3035
cover_pylib = false
3136
# NOTE: `disable_warnings` is needed when `pytest-cov` runs in tandem
3237
# NOTE: with `pytest-xdist`. These warnings are false negative in this

.github/workflows/ci-cd.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ jobs:
782782
store-sdist-to-artifact:
783783
- false
784784
include:
785-
- python-version: 3.12
785+
- python-version: 3.14
786786
runner-vm-os: ubuntu-22.04
787787
store-sdist-to-artifact: true
788788

@@ -1163,6 +1163,8 @@ jobs:
11631163
strategy:
11641164
matrix:
11651165
python-version:
1166+
- "3.14"
1167+
- "3.13"
11661168
- "3.12"
11671169
- "3.11"
11681170
- "3.10"
@@ -1201,6 +1203,8 @@ jobs:
12011203
strategy:
12021204
matrix:
12031205
python-version:
1206+
- "3.14"
1207+
- "3.13"
12041208
- "3.12"
12051209
- "3.11"
12061210
- "3.10"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
825.contrib.1.rst
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
825.contrib.2.rst
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
825.packaging.rst
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
The CI now tests wheels built for Python 3.13 and 3.14
2+
-- by :user:`cidrblock` and :user:`webknjaz`.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
The coverage measurement infrastructure now uses the ``ctrace``
2+
:external+coveragepy:std:ref:`measurement core <config_run_core>`
3+
across all the Python versions consistently -- by :user:`webknjaz`.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
The core packaging metadata now reflects that we test the project under
2+
Python 3.13 and 3.14 (with GIL enabled)
3+
-- by :user:`cidrblock` and :user:`webknjaz`.

docs/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@
138138

139139
# Example configuration for intersphinx: refer to the Python standard library.
140140
intersphinx_mapping = {
141+
'coveragepy': ('https://coverage.readthedocs.io/en/latest', None),
141142
'cython': ('https://cython.readthedocs.io/en/latest', None),
142143
'packaging': ('https://packaging.python.org', None),
143144
'pip': ('https://pip.pypa.io/en/latest', None),

setup.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ classifiers =
2828
Programming Language :: Python :: 3.10
2929
Programming Language :: Python :: 3.11
3030
Programming Language :: Python :: 3.12
31+
Programming Language :: Python :: 3.13
32+
Programming Language :: Python :: 3.14
3133
Programming Language :: Cython
3234

3335
Topic :: Software Development :: Libraries :: Python Modules

0 commit comments

Comments
 (0)