From 0d50d81a7915c464f8fd4cb98fcd98a049eadf43 Mon Sep 17 00:00:00 2001
From: A5rocks <git@helvetica.moe>
Date: Tue, 27 Oct 2026 02:15:58 -0400
Subject: [PATCH] Use 3.15 in CI

---
 .github/workflows/ci.yml       | 8 ++++----
 newsfragments/3563.feature.rst | 1 +
 pyproject.toml                 | 1 +
 src/trio/socket.py             | 1 +
 tox.ini                        | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 newsfragments/3563.feature.rst

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5e2e758ecd..ad39592c88 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -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: ['']
@@ -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: ['']
@@ -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: >-
       ${{
         (
@@ -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
diff --git a/newsfragments/3563.feature.rst b/newsfragments/3563.feature.rst
new file mode 100644
index 0000000000..c9cb4b0e7e
--- /dev/null
+++ b/newsfragments/3563.feature.rst
@@ -0,0 +1 @@
+Mark that we support 3.15.
diff --git a/pyproject.toml b/pyproject.toml
index fc9153674e..8ebfa12ee6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -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",
 ]
diff --git a/src/trio/socket.py b/src/trio/socket.py
index 77c0c457bd..5d4e313136 100644
--- a/src/trio/socket.py
+++ b/src/trio/socket.py
@@ -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,
         SO_PASSSEC as SO_PASSSEC,
         SO_PEERCRED as SO_PEERCRED,
         SO_PEERSEC as SO_PEERSEC,
diff --git a/tox.ini b/tox.ini
index 0b335d22c7..e09c1d97ca 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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