Merge remote-tracking branch 'upstream' into upgrade-ruff

Author: Daraan

.github/workflows/ci.yml

@@ -24,16 +24,11 @@ jobs:
   tests:
     name: Run tests
 
+    # if 'schedule' was the trigger,
+    # don't run it on contributors' forks
     if: >-
-      # if 'schedule' was the trigger,
-      # don't run it on contributors' forks
-      ${{
-        github.event_name != 'schedule'
-        || (
-          github.repository == 'python/typing_extensions'
-          && github.event_name == 'schedule'
-        )
-      }}
+      github.repository == 'python/typing_extensions'
+      || github.event_name != 'schedule'
 
     strategy:
       fail-fast: false
@@ -43,23 +38,22 @@ jobs:
         # For available versions, see:
         # https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json
         python-version:
-          - "3.8"
-          - "3.8.0"
           - "3.9"
-          - "3.9.0"
+          - "3.9.12"
           - "3.10"
-          - "3.10.0"
+          - "3.10.4"
           - "3.11"
           - "3.11.0"
           - "3.12"
           - "3.12.0"
           - "3.13"
           - "3.13.0"
-          - "pypy3.8"
+          - "3.14"
           - "pypy3.9"
           - "pypy3.10"
+          - "pypy3.11"
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4
@@ -75,6 +69,7 @@ jobs:
           # Be wary of running `pip install` here, since it becomes easy for us to
           # accidentally pick up typing_extensions as installed by a dependency
           cd src
+          python --version  # just to make sure we're running the right one
           python -m unittest test_typing_extensions.py
 
       - name: Test CPython typing test suite
@@ -86,27 +81,6 @@ jobs:
           # because we monkeypatch typing under some circumstances.
           python -c 'import typing_extensions; import test.__main__' test_typing -v
 
-  linting:
-    name: Lint
-
-    # no reason to run this as a cron job
-    if: github.event_name != 'schedule'
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3"
-          cache: "pip"
-          cache-dependency-path: "test-requirements.txt"
-      - name: Install dependencies
-        run: pip install -r test-requirements.txt
-      - name: Lint implementation
-        run: ruff check
-
   create-issue-on-failure:
     name: Create an issue if daily tests failed
     runs-on: ubuntu-latest

.github/workflows/publish.yml

@@ -63,9 +63,10 @@ jobs:
           path: dist/
       - name: Install wheel
         run: |
-          export path_to_file=$(find dist -type f -name "typing_extensions-*.whl")
+          path_to_file="$(find dist -type f -name "typing_extensions-*.whl")"
+          export path_to_file
           echo "::notice::Installing wheel: $path_to_file"
-          python -m pip install --user $path_to_file
+          python -m pip install --user "$path_to_file"
           python -m pip list
       - name: Run typing_extensions tests against installed package
         run: rm src/typing_extensions.py && python src/test_typing_extensions.py
@@ -89,10 +90,11 @@ jobs:
           path: dist/
       - name: Unpack and test source distribution
         run: |
-          export path_to_file=$(find dist -type f -name "typing_extensions-*.tar.gz")
+          path_to_file="$(find dist -type f -name "typing_extensions-*.tar.gz")"
+          export path_to_file
           echo "::notice::Unpacking source distribution: $path_to_file"
-          tar xzf $path_to_file -C dist/
-          cd ${path_to_file%.tar.gz}/src
+          tar xzf "$path_to_file" -C dist/
+          cd "${path_to_file%.tar.gz}/src"
           python test_typing_extensions.py
 
   test-sdist-installed:
@@ -114,9 +116,10 @@ jobs:
           path: dist/
       - name: Install source distribution
         run: |
-          export path_to_file=$(find dist -type f -name "typing_extensions-*.tar.gz")
+          path_to_file="$(find dist -type f -name "typing_extensions-*.tar.gz")"
+          export path_to_file
           echo "::notice::Installing source distribution: $path_to_file"
-          python -m pip install --user $path_to_file
+          python -m pip install --user "$path_to_file"
           python -m pip list
       - name: Run typing_extensions tests against installed package
         run: rm src/typing_extensions.py && python src/test_typing_extensions.py
@@ -144,6 +147,6 @@ jobs:
           name: python-package-distributions
           path: dist/
       - name: Ensure exactly one sdist and one wheel have been downloaded
-        run: test $(ls dist/*.tar.gz | wc -l) = 1 && test $(ls dist/*.whl | wc -l) = 1
+        run: test "$(find dist/*.tar.gz | wc -l | xargs)" = 1 && test "$(find dist/*.whl | wc -l | xargs)" = 1
       - name: Publish distribution to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/third_party.yml

@@ -35,7 +35,7 @@ jobs:
       github.repository == 'python/typing_extensions'
       || github.event_name != 'schedule'
     steps:
-      - run: true
+      - run: "true"
 
   pydantic:
     name: pydantic tests
@@ -98,7 +98,7 @@ jobs:
         run: |
           set -x
           cd typing_inspect
-          uv pip install --system -r test-requirements.txt --exclude-newer $(git show -s --date=format:'%Y-%m-%dT%H:%M:%SZ' --format=%cd HEAD)
+          uv pip install --system -r test-requirements.txt --exclude-newer "$(git show -s --date=format:'%Y-%m-%dT%H:%M:%SZ' --format=%cd HEAD)"
       - name: Install typing_extensions latest
         run: uv pip install --system "typing-extensions @ ./typing-extensions-latest"
       - name: List all installed dependencies
@@ -108,8 +108,8 @@ jobs:
           cd typing_inspect
           pytest
 
-  pyanalyze:
-    name: pyanalyze tests
+  pycroscope:
+    name: pycroscope tests
     needs: skip-schedule-on-fork
     strategy:
       fail-fast: false
@@ -125,25 +125,25 @@ jobs:
           allow-prereleases: true
       - name: Install uv
         run: curl -LsSf https://astral.sh/uv/install.sh | sh
-      - name: Check out pyanalyze
-        run: git clone --depth=1 https://github.com/quora/pyanalyze.git || git clone --depth=1 https://github.com/quora/pyanalyze.git
+      - name: Check out pycroscope
+        run: git clone --depth=1 https://github.com/JelleZijlstra/pycroscope.git || git clone --depth=1 https://github.com/JelleZijlstra/pycroscope.git
       - name: Checkout typing_extensions
         uses: actions/checkout@v4
         with:
           path: typing-extensions-latest
-      - name: Install pyanalyze test requirements
+      - name: Install pycroscope test requirements
         run: |
           set -x
-          cd pyanalyze
-          uv pip install --system 'pyanalyze[tests] @ .' --exclude-newer $(git show -s --date=format:'%Y-%m-%dT%H:%M:%SZ' --format=%cd HEAD)
+          cd pycroscope
+          uv pip install --system 'pycroscope[tests] @ .' --exclude-newer "$(git show -s --date=format:'%Y-%m-%dT%H:%M:%SZ' --format=%cd HEAD)"
       - name: Install typing_extensions latest
         run: uv pip install --system "typing-extensions @ ./typing-extensions-latest"
       - name: List all installed dependencies
         run: uv pip freeze
-      - name: Run pyanalyze tests
+      - name: Run pycroscope tests
         run: |
-          cd pyanalyze
-          pytest pyanalyze/
+          cd pycroscope
+          pytest pycroscope/
 
   typeguard:
     name: typeguard tests
@@ -172,7 +172,7 @@ jobs:
         run: |
           set -x
           cd typeguard
-          uv pip install --system "typeguard[test] @ ."  --exclude-newer $(git show -s --date=format:'%Y-%m-%dT%H:%M:%SZ' --format=%cd HEAD)
+          uv pip install --system "typeguard @ ." --group test  --exclude-newer "$(git show -s --date=format:'%Y-%m-%dT%H:%M:%SZ' --format=%cd HEAD)"
       - name: Install typing_extensions latest
         run: uv pip install --system "typing-extensions @ ./typing-extensions-latest"
       - name: List all installed dependencies
@@ -215,8 +215,8 @@ jobs:
         run: |
           set -x
           cd typed-argument-parser
-          uv pip install --system "typed-argument-parser @ ."  --exclude-newer $(git show -s --date=format:'%Y-%m-%dT%H:%M:%SZ' --format=%cd HEAD)
-          uv pip install --system pytest  --exclude-newer $(git show -s --date=format:'%Y-%m-%dT%H:%M:%SZ' --format=%cd HEAD)
+          uv pip install --system "typed-argument-parser @ ."  --exclude-newer "$(git show -s --date=format:'%Y-%m-%dT%H:%M:%SZ' --format=%cd HEAD)"
+          uv pip install --system pytest  --exclude-newer "$(git show -s --date=format:'%Y-%m-%dT%H:%M:%SZ' --format=%cd HEAD)"
       - name: Install typing_extensions latest
         run: uv pip install --system "typing-extensions @ ./typing-extensions-latest"
       - name: List all installed dependencies
@@ -253,7 +253,7 @@ jobs:
         run: |
           set -x
           cd mypy
-          uv pip install --system -r test-requirements.txt  --exclude-newer $(git show -s --date=format:'%Y-%m-%dT%H:%M:%SZ' --format=%cd HEAD)
+          uv pip install --system -r test-requirements.txt  --exclude-newer "$(git show -s --date=format:'%Y-%m-%dT%H:%M:%SZ' --format=%cd HEAD)"
           uv pip install --system -e .
       - name: Install typing_extensions latest
         run: uv pip install --system "typing-extensions @ ./typing-extensions-latest"
@@ -270,8 +270,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # skip 3.13 because msgspec doesn't support 3.13 yet
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
@@ -299,18 +298,89 @@ jobs:
       - name: Run cattrs tests
         run: cd cattrs; pdm run pytest tests
 
+  sqlalchemy:
+    name: sqlalchemy tests
+    needs: skip-schedule-on-fork
+    strategy:
+      fail-fast: false
+      matrix:
+        # PyPy is deliberately omitted here, since SQLAlchemy's tests
+        # fail on PyPy for reasons unrelated to typing_extensions.
+        python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
+        checkout-ref: [ "main", "rel_2_0" ]
+    # sqlalchemy tests fail when using the Ubuntu 24.04 runner
+    # https://github.com/sqlalchemy/sqlalchemy/commit/8d73205f352e68c6603e90494494ef21027ec68f
+    runs-on: ubuntu-22.04
+    timeout-minutes: 60
+    steps:
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+          allow-prereleases: true
+      - name: Install uv
+        run: curl -LsSf https://astral.sh/uv/install.sh | sh
+      - name: Checkout sqlalchemy
+        run: git clone -b ${{ matrix.checkout-ref }} --depth=1 https://github.com/sqlalchemy/sqlalchemy.git || git clone -b ${{ matrix.checkout-ref }} --depth=1 https://github.com/sqlalchemy/sqlalchemy.git
+      - name: Checkout typing_extensions
+        uses: actions/checkout@v4
+        with:
+          path: typing-extensions-latest
+      - name: Install sqlalchemy test dependencies
+        run: uv pip install --system tox setuptools
+      - name: List installed dependencies
+        # Note: tox installs SQLAlchemy and its dependencies in a different isolated
+        # environment before running the tests. To see the dependencies installed
+        # in the test environment, look for the line 'freeze> python -m pip freeze --all'
+        # in the output of the test step below.
+        run: uv pip list
+      - name: Run sqlalchemy tests
+        run: |
+          cd sqlalchemy
+          tox -e github-nocext \
+            --force-dep "typing-extensions @ file://$(pwd)/../typing-extensions-latest" \
+            -- -q --nomemory --notimingintensive
+
+
+  litestar:
+    name: litestar tests
+    needs: skip-schedule-on-fork
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
+    steps:
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Checkout litestar
+        run: git clone --depth=1 https://github.com/litestar-org/litestar.git || git clone --depth=1 https://github.com/litestar-org/litestar.git
+      - name: Checkout typing_extensions
+        uses: actions/checkout@v4
+        with:
+          path: typing-extensions-latest
+      - name: Install uv
+        run: curl -LsSf https://astral.sh/uv/install.sh | sh
+      - name: Run litestar tests
+        run: uv run --with=../typing-extensions-latest -- python -m pytest tests/unit/test_typing.py tests/unit/test_dto
+        working-directory: litestar
+
   create-issue-on-failure:
     name: Create an issue if daily tests failed
     runs-on: ubuntu-latest
 
     needs:
       - pydantic
       - typing_inspect
-      - pyanalyze
+      - pycroscope
       - typeguard
       - typed-argument-parser
       - mypy
       - cattrs
+      - sqlalchemy
 
     if: >-
         ${{
@@ -320,11 +390,12 @@ jobs:
           && (
             needs.pydantic.result == 'failure'
             || needs.typing_inspect.result == 'failure'
-            || needs.pyanalyze.result == 'failure'
+            || needs.pycroscope.result == 'failure'
             || needs.typeguard.result == 'failure'
             || needs.typed-argument-parser.result == 'failure'
             || needs.mypy.result == 'failure'
             || needs.cattrs.result == 'failure'
+            || needs.sqlalchemy.result == 'failure'
           )
         }}
 

.pre-commit-config.yaml

@@ -0,0 +1,42 @@
+repos:
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.9.6
+    hooks:
+      - id: ruff
+        args: [--fix, --exit-non-zero-on-fix]
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.5.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-docstring-first
+      - id: check-yaml
+      - id: check-toml
+      - id: check-merge-conflict
+      - id: check-case-conflict
+      - id: forbid-submodules
+      - id: mixed-line-ending
+        args: [--fix=lf]
+  - repo: https://github.com/python-jsonschema/check-jsonschema
+    rev: 0.33.0
+    hooks:
+      - id: check-dependabot
+      - id: check-github-workflows
+      - id: check-readthedocs
+  - repo: https://github.com/abravalheri/validate-pyproject
+    rev: v0.24.1
+    hooks:
+      - id: validate-pyproject
+        additional_dependencies: ["validate-pyproject-schema-store[all]"]
+  - repo: https://github.com/rhysd/actionlint
+    rev: v1.7.7
+    hooks:
+      - id: actionlint
+        additional_dependencies:
+          # actionlint has a shellcheck integration which extracts shell scripts in `run:` steps from GitHub Actions
+          # and checks these with shellcheck. This is arguably its most useful feature,
+          # but the integration only works if shellcheck is installed
+          - "github.com/wasilibs/go-shellcheck/cmd/shellcheck@v0.10.0"
+  - repo: meta
+    hooks:
+      - id: check-hooks-apply

.readthedocs.yaml

@@ -10,4 +10,3 @@ build:
 
 sphinx:
   configuration: doc/conf.py
-