Skip to content

Commit 9f2df4e

Browse files
authored
Merge pull request #3563 from A5rocks/py3.15
Use 3.15 in CI
2 parents 354708e + 0d50d81 commit 9f2df4e

5 files changed

Lines changed: 8 additions & 5 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ jobs:
168168
strategy:
169169
fail-fast: false
170170
matrix:
171-
python: ['3.10', '3.11', '3.12', '3.13', '3.14', '3.14t', '3.15-dev']
171+
python: ['3.10', '3.11', '3.12', '3.13', '3.14', '3.14t', '3.15', '3.15t']
172172
arch: ['x86', 'x64']
173173
lsp: ['']
174174
lsp_extract_file: ['']
@@ -243,7 +243,7 @@ jobs:
243243
strategy:
244244
fail-fast: false
245245
matrix:
246-
python: ['pypy-3.11', '3.10', '3.11', '3.12', '3.13', '3.14', '3.14t', '3.15-dev']
246+
python: ['pypy-3.11', '3.10', '3.11', '3.12', '3.13', '3.14', '3.14t', '3.15', '3.15t']
247247
check_formatting: ['0']
248248
no_test_requirements: ['0']
249249
extra_name: ['']
@@ -321,7 +321,7 @@ jobs:
321321
strategy:
322322
fail-fast: false
323323
matrix:
324-
python: ['pypy-3.11', '3.10', '3.11', '3.12', '3.13', '3.14', '3.14t', '3.15-dev']
324+
python: ['pypy-3.11', '3.10', '3.11', '3.12', '3.13', '3.14', '3.14t', '3.15', '3.15t']
325325
continue-on-error: >-
326326
${{
327327
(
@@ -419,7 +419,7 @@ jobs:
419419
# TODO: technically we should pin cython versions
420420
- python: '3.10'
421421
cython: '>=3'
422-
- python: '3.14'
422+
- python: '3.15'
423423
cython: '>=3'
424424
steps:
425425
- name: Retrieve the project source from an sdist inside the GHA artifact

‎newsfragments/3563.feature.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Mark that we support 3.15.

‎pyproject.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ classifiers = [
3131
"Programming Language :: Python :: 3.12",
3232
"Programming Language :: Python :: 3.13",
3333
"Programming Language :: Python :: 3.14",
34+
"Programming Language :: Python :: 3.15",
3435
"Topic :: System :: Networking",
3536
"Typing :: Typed",
3637
]

‎src/trio/socket.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,7 @@
582582
SO_OOBINLINE as SO_OOBINLINE,
583583
SO_ORIGINAL_DST as SO_ORIGINAL_DST,
584584
SO_PASSCRED as SO_PASSCRED,
585+
SO_PASSRIGHTS as SO_PASSRIGHTS,
585586
SO_PASSSEC as SO_PASSSEC,
586587
SO_PEERCRED as SO_PEERCRED,
587588
SO_PEERSEC as SO_PEERSEC,

‎tox.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py{39,310,311,312,313,314,py310,py311}
2+
envlist = py{39,310,311,312,313,314,315,py310,py311}
33
labels =
44
check = typing, gen_exports, type_completeness, pip_compile
55
cython = py39-cython2,py39-cython,py311-cython2,py313-cython

0 commit comments

Comments
 (0)