Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python: ['3.10', '3.11', '3.12', '3.13', '3.14', '3.14t', '3.15-dev']
python: ['3.10', '3.11', '3.12', '3.13', '3.14', '3.14t', '3.15', '3.15t']
arch: ['x86', 'x64']
lsp: ['']
lsp_extract_file: ['']
Expand Down Expand Up @@ -243,7 +243,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python: ['pypy-3.11', '3.10', '3.11', '3.12', '3.13', '3.14', '3.14t', '3.15-dev']
python: ['pypy-3.11', '3.10', '3.11', '3.12', '3.13', '3.14', '3.14t', '3.15', '3.15t']
check_formatting: ['0']
no_test_requirements: ['0']
extra_name: ['']
Expand Down Expand Up @@ -321,7 +321,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python: ['pypy-3.11', '3.10', '3.11', '3.12', '3.13', '3.14', '3.14t', '3.15-dev']
python: ['pypy-3.11', '3.10', '3.11', '3.12', '3.13', '3.14', '3.14t', '3.15', '3.15t']
continue-on-error: >-
${{
(
Expand Down Expand Up @@ -419,7 +419,7 @@ jobs:
# TODO: technically we should pin cython versions
- python: '3.10'
cython: '>=3'
- python: '3.14'
- python: '3.15'
cython: '>=3'
steps:
- name: Retrieve the project source from an sdist inside the GHA artifact
Expand Down
1 change: 1 addition & 0 deletions newsfragments/3563.feature.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Mark that we support 3.15.
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ classifiers = [
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
"Programming Language :: Python :: 3.15",
"Topic :: System :: Networking",
"Typing :: Typed",
]
Expand Down
1 change: 1 addition & 0 deletions src/trio/socket.py
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,7 @@
SO_OOBINLINE as SO_OOBINLINE,
SO_ORIGINAL_DST as SO_ORIGINAL_DST,
SO_PASSCRED as SO_PASSCRED,
SO_PASSRIGHTS as SO_PASSRIGHTS,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh I see, I hadn't synced with the latest changes, that explains it! #3563 (comment) Fixed!

SO_PASSSEC as SO_PASSSEC,
SO_PEERCRED as SO_PEERCRED,
SO_PEERSEC as SO_PEERSEC,
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py{39,310,311,312,313,314,py310,py311}
envlist = py{39,310,311,312,313,314,315,py310,py311}
labels =
check = typing, gen_exports, type_completeness, pip_compile
cython = py39-cython2,py39-cython,py311-cython2,py313-cython
Expand Down
Loading