From a407c550ba6c94684558b35d30b277d44cd440b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edgar=20Ram=C3=ADrez-Mondrag=C3=B3n?= <edgarrm358@gmail.com>
Date: Mon, 24 Jun 2024 18:54:02 +0200
Subject: [PATCH 1/2] Test with Python 3.13

---
 .github/workflows/ci.yaml | 2 ++
 .mergify.yml              | 1 +
 setup.cfg                 | 1 +
 tox.ini                   | 8 ++++----
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 9dfa734..d8fe3c1 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -30,6 +30,8 @@ jobs:
             tox: py312,py312-trio
           - python: "3.12"
             tox: pep8
+          - python: "3.13"
+            tox: py313
           - python: "3.11"
             tox: mypy
     steps:
diff --git a/.mergify.yml b/.mergify.yml
index 7eeace4..4fa989f 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -14,6 +14,7 @@ queue_rules:
       - "check-success=test (3.9, py39)"
       - "check-success=test (3.10, py310)"
       - "check-success=test (3.11, py311)"
+      - "check-success=test (3.13, py313)"
       - "check-success=test (3.12, py312,py312-trio)"
       - "check-success=test (3.12, pep8)"
 
diff --git a/setup.cfg b/setup.cfg
index ccb824a..be14f69 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,6 +18,7 @@ classifier =
     Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.11
     Programming Language :: Python :: 3.12
+    Programming Language :: Python :: 3.13
     Topic :: Utilities
 
 [options]
diff --git a/tox.ini b/tox.ini
index 14f8ae0..74edc4f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py3{8,9,10,11,12,12-trio}, pep8, pypy3
+envlist = py3{8,9,10,11,12,12-trio,13}, pep8, pypy3
 skip_missing_interpreters = True
 
 [testenv]
@@ -10,9 +10,9 @@ deps =
     .[doc]
     trio: trio
 commands =
-    py3{8,9,10,11,12},pypy3: pytest {posargs}
-    py3{8,9,10,11,12},pypy3: sphinx-build -a -E -W -b doctest doc/source doc/build
-    py3{8,9,10,11,12},pypy3: sphinx-build -a -E -W -b html doc/source doc/build
+    py3{8,9,10,11,12,13},pypy3: pytest {posargs}
+    py3{8,9,10,11,12,13},pypy3: sphinx-build -a -E -W -b doctest doc/source doc/build
+    py3{8,9,10,11,12,13},pypy3: sphinx-build -a -E -W -b html doc/source doc/build
 
 [testenv:pep8]
 basepython = python3

From 6646c982a038f1003d177605a38048b3b206d170 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edgar=20Ram=C3=ADrez=20Mondrag=C3=B3n?=
 <16805946+edgarrmondragon@users.noreply.github.com>
Date: Wed, 23 Oct 2024 07:21:00 -0600
Subject: [PATCH 2/2] Test trio with Python 3.13

Co-authored-by: John Litborn <11260241+jakkdl@users.noreply.github.com>
---
 .github/workflows/ci.yaml | 4 ++--
 tox.ini                   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d8fe3c1..055fec2 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -27,11 +27,11 @@ jobs:
           - python: "3.11"
             tox: py311
           - python: "3.12"
-            tox: py312,py312-trio
+            tox: py312
           - python: "3.12"
             tox: pep8
           - python: "3.13"
-            tox: py313
+            tox: py313,py313-trio
           - python: "3.11"
             tox: mypy
     steps:
diff --git a/tox.ini b/tox.ini
index 74edc4f..fb76d04 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,6 @@
 [tox]
-envlist = py3{8,9,10,11,12,12-trio,13}, pep8, pypy3
+# we only test trio on latest python version
+envlist = py3{8,9,10,11,12,13,13-trio}, pep8, pypy3
 skip_missing_interpreters = True
 
 [testenv]