From a49b390c3a5632596529448ece6d12497bd4b348 Mon Sep 17 00:00:00 2001
From: Quentin Pradet <quentin.pradet@gmail.com>
Date: Tue, 18 Apr 2023 08:06:04 +0400
Subject: [PATCH 1/4] Bump test/docs dependencies

---
 docs-requirements.txt | 8 ++------
 test-requirements.txt | 4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/docs-requirements.txt b/docs-requirements.txt
index ae0c01d..299a963 100644
--- a/docs-requirements.txt
+++ b/docs-requirements.txt
@@ -1,6 +1,6 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.10
+# by the following command:
 #
 #    pip-compile docs-requirements.in
 #
@@ -40,8 +40,6 @@ idna==3.4
     #   trio
 imagesize==1.4.1
     # via sphinx
-importlib-metadata==5.0.0
-    # via sphinx
 incremental==22.10.0
     # via towncrier
 iniconfig==1.1.1
@@ -109,8 +107,6 @@ trio==0.22.0
     # via -r docs-requirements.in
 urllib3==1.26.12
     # via requests
-zipp==3.10.0
-    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/test-requirements.txt b/test-requirements.txt
index b1d1509..661ff71 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,3 +1,3 @@
-pytest==7.2.0
+pytest==7.3.1
 pytest-cov==4.0.0
-hypothesis==6.56.4
+0ypothesis==6.72.0

From c95d7807437026fb1a63eee95b7cee81d56d500b Mon Sep 17 00:00:00 2001
From: Quentin Pradet <quentin.pradet@gmail.com>
Date: Tue, 18 Apr 2023 08:07:36 +0400
Subject: [PATCH 2/4] Fix typo

---
 test-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 661ff71..0d4be55 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,3 +1,3 @@
 pytest==7.3.1
 pytest-cov==4.0.0
-0ypothesis==6.72.0
+hypothesis==6.72.0

From 3536b92d94c02f5d86e71aa9ca23a7cea5802324 Mon Sep 17 00:00:00 2001
From: Quentin Pradet <quentin.pradet@gmail.com>
Date: Tue, 18 Apr 2023 08:17:28 +0400
Subject: [PATCH 3/4] Format with black 23

---
 ci.sh                                          | 2 +-
 docs/source/conf.py                            | 1 +
 pytest_trio/_tests/test_async_fixture.py       | 5 -----
 pytest_trio/_tests/test_async_yield_fixture.py | 6 ------
 pytest_trio/_tests/test_basic.py               | 4 ----
 pytest_trio/_tests/test_sync_fixture.py        | 3 ---
 6 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/ci.sh b/ci.sh
index aae8b3c..0e02981 100755
--- a/ci.sh
+++ b/ci.sh
@@ -30,7 +30,7 @@ python setup.py sdist --formats=zip
 python -m pip install dist/*.zip
 
 if [ "$CHECK_FORMATTING" = "1" ]; then
-    pip install black
+    pip install black~=23.0
     if ! black --check . ; then
         cat <<EOF
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 7a71ac8..ff74f8b 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -45,6 +45,7 @@
     ("py:obj", "bytes-like"),
 ]
 
+
 # XX hack the RTD theme until
 #   https://github.com/rtfd/sphinx_rtd_theme/pull/382
 # is shipped (should be in the release after 0.2.4)
diff --git a/pytest_trio/_tests/test_async_fixture.py b/pytest_trio/_tests/test_async_fixture.py
index 88c4aa9..3703f73 100644
--- a/pytest_trio/_tests/test_async_fixture.py
+++ b/pytest_trio/_tests/test_async_fixture.py
@@ -2,7 +2,6 @@
 
 
 def test_single_async_fixture(testdir):
-
     testdir.makepyfile(
         """
         import pytest
@@ -25,7 +24,6 @@ async def test_simple(fix1):
 
 
 def test_async_fixture_recomputed_for_each_test(testdir):
-
     testdir.makepyfile(
         """
         import pytest
@@ -56,7 +54,6 @@ async def test_second(fix1):
 
 
 def test_nested_async_fixture(testdir):
-
     testdir.makepyfile(
         """
         import pytest
@@ -89,7 +86,6 @@ async def test_both(fix1, fix2):
 
 
 def test_async_within_sync_fixture(testdir):
-
     testdir.makepyfile(
         """
         import pytest
@@ -122,7 +118,6 @@ async def test_simple(sync_fix):
 # async fixture...
 @pytest.mark.xfail(reason="Not implemented yet")
 def test_raise_in_async_fixture_cause_pytest_error(testdir):
-
     testdir.makepyfile(
         """
         import pytest
diff --git a/pytest_trio/_tests/test_async_yield_fixture.py b/pytest_trio/_tests/test_async_yield_fixture.py
index ca99159..9505eb2 100644
--- a/pytest_trio/_tests/test_async_yield_fixture.py
+++ b/pytest_trio/_tests/test_async_yield_fixture.py
@@ -38,7 +38,6 @@ def test_after():
 
 
 def test_nested_async_yield_fixture(testdir):
-
     testdir.makepyfile(
         """
         import pytest
@@ -93,7 +92,6 @@ def test_after():
 
 
 def test_async_yield_fixture_within_sync_fixture(testdir):
-
     testdir.makepyfile(
         """
         import pytest
@@ -139,7 +137,6 @@ def test_after():
 
 
 def test_async_yield_fixture_within_sync_yield_fixture(testdir):
-
     testdir.makepyfile(
         """
         import pytest
@@ -190,7 +187,6 @@ def test_after():
 
 
 def test_async_yield_fixture_with_multiple_yields(testdir):
-
     testdir.makepyfile(
         """
         import pytest
@@ -217,7 +213,6 @@ async def test_actual_test(fix1):
 
 
 def test_async_yield_fixture_with_nursery(testdir):
-
     testdir.makepyfile(
         """
         import pytest
@@ -253,7 +248,6 @@ async def test_actual_test(server):
 
 
 def test_async_yield_fixture_crashed_teardown_allow_other_teardowns(testdir):
-
     testdir.makepyfile(
         """
         import pytest
diff --git a/pytest_trio/_tests/test_basic.py b/pytest_trio/_tests/test_basic.py
index 9702498..f95538f 100644
--- a/pytest_trio/_tests/test_basic.py
+++ b/pytest_trio/_tests/test_basic.py
@@ -2,7 +2,6 @@
 
 
 def test_async_test_is_executed(testdir):
-
     testdir.makepyfile(
         """
         import pytest
@@ -27,7 +26,6 @@ def test_check_async_test_called():
 
 
 def test_async_test_as_class_method(testdir):
-
     testdir.makepyfile(
         """
         import pytest
@@ -60,7 +58,6 @@ def test_check_async_test_called():
 
 @pytest.mark.xfail(reason="Raises pytest internal error so far...")
 def test_sync_function_with_trio_mark(testdir):
-
     testdir.makepyfile(
         """
         import pytest
@@ -77,7 +74,6 @@ def test_invalid():
 
 
 def test_skip_and_xfail(testdir):
-
     testdir.makepyfile(
         """
         import functools
diff --git a/pytest_trio/_tests/test_sync_fixture.py b/pytest_trio/_tests/test_sync_fixture.py
index 738ffbc..c6060a4 100644
--- a/pytest_trio/_tests/test_sync_fixture.py
+++ b/pytest_trio/_tests/test_sync_fixture.py
@@ -12,7 +12,6 @@ async def test_single_sync_fixture(sync_fix):
 
 
 def test_single_yield_fixture(testdir):
-
     testdir.makepyfile(
         """
         import pytest
@@ -47,7 +46,6 @@ def test_after():
 
 
 def test_single_yield_fixture_with_async_deps(testdir):
-
     testdir.makepyfile(
         """
         import pytest
@@ -90,7 +88,6 @@ def test_after():
 
 
 def test_sync_yield_fixture_crashed_teardown_allow_other_teardowns(testdir):
-
     testdir.makepyfile(
         """
         import pytest

From 83b615b7c7a17957cc61cf0695c28e8c809845c6 Mon Sep 17 00:00:00 2001
From: Quentin Pradet <quentin.pradet@gmail.com>
Date: Tue, 18 Apr 2023 08:23:02 +0400
Subject: [PATCH 4/4] Bump GitHub Actions

---
 .github/workflows/ci.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e9544ed..b4a2701 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,9 +16,9 @@ jobs:
         python: ['3.7', '3.8', '3.9', '3.10', '3.11']
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Setup python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: '${{ matrix.python }}'
       - name: Run tests
@@ -48,14 +48,14 @@ jobs:
             extra_name: ', check docs'
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Setup python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         if: "!endsWith(matrix.python, '-dev')"
         with:
           python-version: '${{ matrix.python }}'
       - name: Setup python (dev)
-        uses: deadsnakes/action@v2.0.2
+        uses: deadsnakes/action@v2.1.1
         if: endsWith(matrix.python, '-dev')
         with:
           python-version: '${{ matrix.python }}'
@@ -77,9 +77,9 @@ jobs:
         python: ['3.7', '3.8', '3.9', '3.10', '3.11']
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Setup python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: '${{ matrix.python }}'
       - name: Run tests