Merge branch 'main' into fix-issue-1427

Author: hynek

.github/CONTRIBUTING.md

@@ -49,19 +49,23 @@ It's people like *you* who make this project such a great tool for everyone.
 
 First, **fork** the repository on GitHub and **clone** it using one of the alternatives that you can copy-paste by pressing the big green button labeled `<> Code`.
 
-You can (and should) run our test suite using [*tox*](https://tox.wiki/).
+You can (and should) run our test suite using [*tox*](https://tox.wiki/) with the [*tox-uv*](https://github.com/tox-dev/tox-uv) plugin.
+The easiest way is to [install *uv*] which is needed in any case and then run `uv tool install --with tox-uv tox` to have it globally available or `uvx --with tox-uv tox` to use a temporary environment.
+
+---
+
 However, you'll probably want a more traditional environment as well.
 
 We recommend using the Python version from the `.python-version-default` file in the project's root directory.
 
-We use a fully-locked development environment using [*uv*](https://docs.astral.sh/uv/) so the easiest way to get started is to [install *uv*](https://docs.astral.sh/uv/getting-started/installation/) and you can run `uv run pytest` to run the tests immediately.
+We use a fully-locked development environment using [*uv*](https://docs.astral.sh/uv/) so the easiest way to get started is to [install *uv*] and you can run `uv run pytest` to run the tests immediately.
 
-I you'd like a traditional virtual environment, you can run `uv sync` and it will create a virtual environment named `.venv` with the correct Python version and install all the dependencies in the root directory.
+I you'd like a traditional virtual environment, you can run `uv sync --python=$(cat .python-version-default)` and it will create a virtual environment named `.venv` with the correct Python version and install all the dependencies in the root directory.
 
 If you're using [*direnv*](https://direnv.net), you can automate the creation and activation of the project's virtual environment with the correct Python version by adding the following `.envrc` to the project root:
 
 ```bash
-uv sync
+uv sync --python=$(cat .python-version-default)
 . .venv/bin/activate
 ```
 
@@ -264,3 +268,4 @@ By participating in this project you agree to abide by its terms.
 Please report any harm to Hynek Schlawack in any way you find appropriate.
 
 [semantic newlines]: https://rhodesmill.org/brandon/2012/one-sentence-per-line/
+[install *uv*]: https://docs.astral.sh/uv/getting-started/installation/

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
           fetch-depth: 0
           persist-credentials: false
 
-      - uses: hynek/build-and-inspect-python-package@b5076c307dc91924a82ad150cdd1533b444d3310 # v2.12.0
+      - uses: hynek/build-and-inspect-python-package@c52c3a4710070b50470d903818a7b25115dcd076 # v2.13.0
         id: baipp
 
     outputs:

.github/workflows/codeql-analysis.yml

@@ -29,12 +29,12 @@ jobs:
           persist-credentials: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
         with:
           languages: ${{ matrix.language }}
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/autobuild@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2

.github/workflows/pypi-package.yml

@@ -26,7 +26,7 @@ jobs:
           fetch-depth: 0
           persist-credentials: false
 
-      - uses: hynek/build-and-inspect-python-package@b5076c307dc91924a82ad150cdd1533b444d3310 # v2.12.0
+      - uses: hynek/build-and-inspect-python-package@c52c3a4710070b50470d903818a7b25115dcd076 # v2.13.0
         with:
           attest-build-provenance-github: 'true'
 

.github/workflows/zizmor.yml

@@ -30,7 +30,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
         with:
           # Path to SARIF file relative to the root of the repository
           sarif_file: results.sarif

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ ci:
 
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.0
+    rev: v0.12.2
     hooks:
       - id: ruff-check
         args: [--fix, --exit-non-zero-on-fix]

pyproject.toml

@@ -37,26 +37,18 @@ Tidelift = "https://tidelift.com/subscription/pkg/pypi-attrs?utm_source=pypi-att
 
 
 [dependency-groups]
-tests-mypy = [
-  # A transitive dependency of pytest-mypy-plugins doesn't build on 3.14 yet.
-  'pytest-mypy-plugins; platform_python_implementation == "CPython" and python_version >= "3.10" and python_version < "3.14"',
-  # Since the mypy error messages keep changing, we have to keep updating this
-  # pin.
-  'mypy>=1.11.1; platform_python_implementation == "CPython" and python_version >= "3.10"',
-]
+tests-mypy = ['pytest-mypy-plugins; platform_python_implementation == "CPython" and python_version >= "3.10"']
 tests = [
   { include-group = "tests-mypy" },
   # For regression test to ensure cloudpickle compat doesn't break.
   'cloudpickle; platform_python_implementation == "CPython"',
   "hypothesis",
   "pympler",
-  # 4.3.0 dropped last use of `convert`
-  "pytest>=4.3.0",
+  "pytest",
 ]
 cov = [
   { include-group = "tests" },
-  # Ensure coverage is new enough for `source_pkgs`.
-  "coverage[toml]>=5.3",
+  "coverage[toml]",
 ]
 pyright = ["pyright", { include-group = "tests" }]
 benchmark = [

tests/test_mypy.yml

@@ -604,7 +604,7 @@
         parent: Optional[A]
 
     reveal_type(A) # N: Revealed type is "def (parent: main.B) -> main.A"
-    reveal_type(B) # N: Revealed type is "def (parent: Union[main.A, None]) -> main.B"
+    reveal_type(B) # N: Revealed type is "def (parent: main.A | None) -> main.B"
     A(B(None))
 
 - case: testAttrsForwardReferenceInClass
@@ -620,7 +620,7 @@
             parent: Optional[A]
 
     reveal_type(A) # N: Revealed type is "def (parent: main.A.B) -> main.A"
-    reveal_type(A.B) # N: Revealed type is "def (parent: Union[main.A, None]) -> main.A.B"
+    reveal_type(A.B) # N: Revealed type is "def (parent: main.A | None) -> main.A.B"
     A(A.B(None))
 
 - case: testAttrsImporting
@@ -739,7 +739,7 @@
 
     AOrB = Union[A, B]
 
-    reveal_type(A)  # N: Revealed type is "def (frob: builtins.list[Union[main.A, main.B]]) -> main.A"
+    reveal_type(A)  # N: Revealed type is "def (frob: builtins.list[main.A | main.B]) -> main.A"
     reveal_type(B)  # N: Revealed type is "def () -> main.B"
 
     A([B()])

tox.ini

@@ -31,14 +31,13 @@ commands =
 dependency_groups = tests
 commands = pytest tests/test_functional.py
 
-[testenv:py3{9,10,13}-tests]
+[testenv:py3{9,10,14}-tests]
 dependency_groups = cov
 # Python 3.6+ has a number of compile-time warnings on invalid string escapes.
 # PYTHONWARNINGS=d makes them visible during the tox run.
 set_env =
     COVERAGE_PROCESS_START={toxinidir}/pyproject.toml
     PYTHONWARNINGS=d
-commands_pre = python -c 'import pathlib; pathlib.Path("{env_site_packages_dir}/cov.pth").write_text("import coverage; coverage.process_startup()")'
 commands =
     coverage run -m pytest {posargs}