Merge branch 'master' into trio_run-for-trio_asyncio

jmehnle · web-flow · commit 257f24b323fa · 2025-10-19T15:51:20.000-07:00
diff --git a/.coveragerc b/.coveragerc
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,20 +7,27 @@ on:
   pull_request:
 
 jobs:
+  ruff:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v5
+    - uses: astral-sh/ruff-action@v3
+
   Windows:
     name: 'Windows (${{ matrix.python }})'
     runs-on: 'windows-latest'
     strategy:
       fail-fast: false
       matrix:
-        python: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        python: ['3.10', '3.11', '3.12', '3.13', '3.14']
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - name: Setup python
-        uses: actions/setup-python@v2
+        uses: actions/checkout@v5
+      - name: Setup Python ${{ matrix.python }}'
+        uses: actions/setup-python@v6
         with:
           python-version: '${{ matrix.python }}'
+          allow-prereleases: true
       - name: Run tests
         run: ./ci.sh
         shell: bash
@@ -35,30 +42,25 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['pypy-3.8', '3.8', 'pypy-3.9', '3.9', 'pypy-3.10', '3.10', '3.11', '3.12']
+        python: ['3.10', '3.11', '3.12', '3.13', '3.14', 'pypy-3.11']
         check_formatting: ['0']
         check_docs: ['0']
         extra_name: ['']
         include:
-          - python: '3.9'
+          - python: '3.x'
             check_formatting: '1'
             extra_name: ', check formatting'
-          - python: '3.9'
+          - python: '3.12'  # sphinx-build: cgi module was removed in 3.13
             check_docs: '1'
             extra_name: ', check docs'
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - name: Setup python
-        uses: actions/setup-python@v2
-        if: "!endsWith(matrix.python, '-dev')"
-        with:
-          python-version: '${{ matrix.python }}'
-      - name: Setup python (dev)
-        uses: deadsnakes/action@v2.0.2
-        if: endsWith(matrix.python, '-dev')
+        uses: actions/checkout@v5
+      - name: Setup Python ${{ matrix.python }}
+        uses: actions/setup-python@v6
         with:
           python-version: '${{ matrix.python }}'
+          allow-prereleases: true
       - name: Run tests
         run: ./ci.sh
         env:
@@ -74,14 +76,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        python: ['3.10', '3.11', '3.12', '3.13', '3.14']
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - name: Setup python
-        uses: actions/setup-python@v2
+        uses: actions/checkout@v5
+      - name: Setup Python ${{ matrix.python }}
+        uses: actions/setup-python@v6
         with:
           python-version: '${{ matrix.python }}'
+          allow-prereleases: true
       - name: Run tests
         run: ./ci.sh
         env:
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -4,7 +4,7 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.9"
+    python: "3.12"  # sphinx-build: cgi module was removed in 3.13
 
 formats:
   - htmlzip
@@ -15,4 +15,5 @@ python:
     - requirements: docs-requirements.txt
 
 sphinx:
+  configuration: docs/source/conf.py
   fail_on_warning: true
diff --git a/ci.sh b/ci.sh
@@ -23,11 +23,11 @@ function curl-harder() {
 }
 
 
-python -m pip install -U pip setuptools wheel
+python -m pip install -U pip build
 python -m pip --version
 
-python setup.py sdist --formats=zip
-python -m pip install dist/*.zip
+python -m build
+python -m pip install dist/*.whl
 
 if [ "$CHECK_FORMATTING" = "1" ]; then
     pip install black
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -101,7 +101,7 @@ def setup(app):
 # built documents.
 #
 # The short X.Y version.
-import pytest_trio
+import pytest_trio  # noqa: E402
 
 version = pytest_trio.__version__
 # The full version, including alpha/beta/rc tags.
@@ -143,7 +143,7 @@ def setup(app):
 # We have to set this ourselves, not only because it's useful for local
 # testing, but also because if we don't then RTD will throw away our
 # html_theme_options.
-import sphinx_rtd_theme
+import sphinx_rtd_theme  # noqa: E402
 
 html_theme = "sphinx_rtd_theme"
 html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,109 @@
+[build-system]
+requires = ["setuptools >= 64"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "pytest-trio"
+dynamic = ["version"]
+authors = [
+  { name="Emmanuel Leblond", email="emmanuel.leblond@gmail.com" },
+]
+description = "Pytest plugin for trio"
+readme = {file = "README.md", content-type = "text/markdown"}
+license = {file = "LICENSE"}
+requires-python = ">=3.10"
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "License :: OSI Approved :: MIT License",
+    "License :: OSI Approved :: Apache Software License",
+    "Natural Language :: English",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Programming Language :: Python :: Implementation :: PyPy",
+    "Operating System :: POSIX :: Linux",
+    "Operating System :: MacOS :: MacOS X",
+    "Operating System :: Microsoft :: Windows",
+    "Operating System :: OS Independent",
+    "Topic :: System :: Networking",
+    "Topic :: Software Development :: Testing",
+    "Framework :: Hypothesis",
+    "Framework :: Pytest",
+    "Framework :: Trio",
+]
+keywords = [
+    "async",
+    "pytest",
+    "testing",
+    "trio",
+]
+dependencies = [
+    "trio >= 0.25.1",  # for upstream Hypothesis integration
+    "outcome >= 1.1.0",
+    "pytest >= 7.2.0",  # for ExceptionGroup support
+]
+
+[tool.setuptools.dynamic]
+version = {attr = "pytest_trio._version.__version__"}
+
+[project.urls]
+"Homepage" = "https://github.com/python-trio/pytest-trio"
+"Source" = "https://github.com/python-trio/pytest-trio"
+"Bug Tracker" = "https://github.com/python-trio/pytest-trio/issues"
+
+[project.entry-points.pytest11]
+trio = "pytest_trio.plugin"
+
+[tool.setuptools.packages]
+find = {namespaces = false}
+
 [tool.towncrier]
 package = "pytest_trio"
 filename = "docs/source/history.rst"
 directory = "newsfragments"
 title_format = "pytest-trio {version} ({project_date})"
 underlines = ["-", "~", "^"]
 issue_format = "`#{issue} <https://github.com/python-trio/pytest-trio/issues/{issue}>`__"
+
+[tool.coverage.run]
+branch = true
+source_pkgs = ["pytest_trio"]
+
+[tool.coverage.report]
+precision = 1
+skip_covered = true
+exclude_lines = [
+    "pragma: no cover",
+    "abc.abstractmethod",
+    "if TYPE_CHECKING.*:",
+    "if _t.TYPE_CHECKING:",
+    "if t.TYPE_CHECKING:",
+    "@overload",
+    'class .*\bProtocol\b.*\):',
+    "raise NotImplementedError",
+]
+partial_branches = [
+    "pragma: no branch",
+    "if not TYPE_CHECKING:",
+    "if not _t.TYPE_CHECKING:",
+    "if not t.TYPE_CHECKING:",
+    "if .* or not TYPE_CHECKING:",
+    "if .* or not _t.TYPE_CHECKING:",
+    "if .* or not t.TYPE_CHECKING:",
+]
+
+[tool.ruff]
+lint.extend-select = [
+    "ASYNC",  # flake8-async
+    "C4",     # flake8-comprehensions
+    "PERF",   # Perflint
+    "PT",     # flake8-pytest-style
+]
+lint.ignore = [
+    "ASYNC115",  # `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
+]
diff --git a/pytest_trio/__init__.py b/pytest_trio/__init__.py
@@ -1,6 +1,6 @@
 """Top-level package for pytest-trio."""
 
-from ._version import __version__
+from ._version import __version__  # noqa: F401
 from .plugin import trio_fixture
 
 __all__ = ["trio_fixture"]
diff --git a/pytest_trio/_tests/test_fixture_mistakes.py b/pytest_trio/_tests/test_fixture_mistakes.py
@@ -1,5 +1,5 @@
-import pytest
-from pytest_trio import trio_fixture
+import pytest  # noqa: F401
+from pytest_trio import trio_fixture  # noqa: F401
 
 from .helpers import enable_trio_mode
 
diff --git a/pytest_trio/_tests/test_trio_mode.py b/pytest_trio/_tests/test_trio_mode.py
@@ -1,4 +1,4 @@
-import pytest
+import pytest  # noqa: F401
 
 from .helpers import enable_trio_mode
 
@@ -164,7 +164,7 @@ async def test():
 
 
 def test_closest_explicit_run_wins(testdir):
-    testdir.makefile(".ini", pytest=f"[pytest]\ntrio_mode = true\ntrio_run = trio\n")
+    testdir.makefile(".ini", pytest="[pytest]\ntrio_mode = true\ntrio_run = trio\n")
     testdir.makepyfile(qtrio=qtrio_text)
 
     test_text = """
@@ -184,7 +184,7 @@ async def test():
 
 
 def test_ini_run_wins_with_blank_marker(testdir):
-    testdir.makefile(".ini", pytest=f"[pytest]\ntrio_mode = true\ntrio_run = qtrio\n")
+    testdir.makefile(".ini", pytest="[pytest]\ntrio_mode = true\ntrio_run = qtrio\n")
     testdir.makepyfile(qtrio=qtrio_text)
 
     test_text = """
diff --git a/pytest_trio/_version.py b/pytest_trio/_version.py
@@ -1,3 +1,3 @@
-# This file is imported from __init__.py and exec'd from setup.py
+# This file is imported from __init__.py and parsed by setuptools
 
 __version__ = "0.8.0+dev"
diff --git a/pytest_trio/plugin.py b/pytest_trio/plugin.py
@@ -283,7 +283,7 @@ async def run(self, test_ctx, contextvars_ctx):
                 for event in self.user_done_events:
                     await event.wait()
             except BaseException as exc:
-                assert isinstance(exc, trio.Cancelled)
+                assert isinstance(exc, trio.Cancelled)  # noqa: PT017
                 yield_outcome = outcome.Error(exc)
                 test_ctx.crash(self, None)
                 with trio.CancelScope(shield=True):
diff --git a/setup.py b/setup.py

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-# This file is imported from __init__.py and exec'd from setup.py`
	`1`	`+# This file is imported from __init__.py and parsed by setuptools`
`2`	`2`
`3`	`3`	`__version__ = "0.8.0+dev"`