Update dependency groups; use newer uv features (#265)

AlexWaygood · Sep 23, 2024 · 4385b02 · 4385b02
1 parent 1565b00
commit 4385b02
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 103 deletions.
diff --git a/.github/workflows/check-requirements.yml b/.github/workflows/check-requirements.yml
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -31,7 +31,9 @@ jobs:
         with:
           python-version: "3.12"
       - name: Install uv
-        run: curl -LsSf https://astral.sh/uv/install.sh | sh
+        uses: astral-sh/setup-uv@v1
+        with:
+          version: "latest"
       - run: uv pip install build --system
       - run: uv pip freeze
       - if: ${{ github.event_name != 'push' }}

diff --git a/.github/workflows/regen-examples-and-docs.yml b/.github/workflows/regen-examples-and-docs.yml
@@ -25,9 +25,11 @@ jobs:
           git config --global user.email ''
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
-      - run: curl -LsSf https://astral.sh/uv/install.sh | sh
-      - run: uv pip install -e .[docs] --system
+          python-version: "3.12"
+      - uses: astral-sh/setup-uv@v1
+        with:
+          version: "latest"
+      - run: uv pip install -e .[dev] --system
       - run: uv pip freeze
       - name: Regenerate examples and docs
         id: regen

diff --git a/.github/workflows/test-website.yml b/.github/workflows/test-website.yml
@@ -21,9 +21,11 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
-      - run: curl -LsSf https://astral.sh/uv/install.sh | sh
-      - run: uv pip install -e .[docs] --system
+          python-version: "3.12"
+      - uses: astral-sh/setup-uv@v1
+        with:
+          version: "latest"
+      - run: uv pip install -e .[dev] --system
       - run: uv pip freeze
       - name: Regenerate examples and docs
         run: python scripts/regenerate.py --download-typeshed

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -51,20 +51,16 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}
-        uses: actions/setup-python@v5
+      - name: Set up uv
+        uses: astral-sh/setup-uv@v1
         with:
-          python-version: ${{ matrix.python-version }}
-          allow-prereleases: true
-      - uses: hynek/setup-cached-uv@v2
-      - name: Install dependencies
-        run: uv pip install -e ".[pytest]" --system
-      - run: uv pip freeze
+          version: "latest"
       - name: Run tests under coverage
         shell: bash
         run: |
-          coverage run -m pytest --doctest-modules
-          coverage report --no-skip-covered
+          uv python pin ${{ matrix.python-version }}
+          uv run --extra=dev coverage run -m pytest --doctest-modules
+          uv run --extra=dev coverage report --no-skip-covered
 
   create-issue-on-failure:
     name: Create an issue if daily test failed

diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml
@@ -35,8 +35,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: curl -LsSf https://astral.sh/uv/install.sh | sh
-      - run: uv run --python=3.11 --extra=typecheck mypy
+      - uses: astral-sh/setup-uv@v1
+        with:
+          version: "latest"
+      - run: uv run --python=3.11 --extra=dev mypy
 
   pyright:
     name: Run pyright on the codebase
@@ -46,8 +48,10 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
-      - uses: hynek/setup-cached-uv@v2
-      - run: uv pip install -e ".[typecheck]" --system
+      - uses: astral-sh/setup-uv@v1
+        with:
+          version: "latest"
+      - run: uv pip install -e ".[dev]" --system
       - run: uv pip freeze
       - name: Run pyright
         uses: jakebailey/pyright-action@v2

diff --git a/pyproject.toml b/pyproject.toml
@@ -51,19 +51,14 @@ typeshed-stats = "typeshed_stats._cli:main"
 
 [project.optional-dependencies]
 rich = ["rich", "rich-argparse>=1"]
-# Include the [rich] extra in the [docs] extra
-# so the CLI docs generated from --help are consistent
-docs = [
+dev = [
     "typeshed-stats[rich]",
     "MarkDown==3.7",
     "mkdocs==1.6.0",
     "mkdocs-macros-plugin==1.0.5",
     "mkdocs-material==9.5.31",
     "mkdocstrings==0.25.2",
     "mkdocstrings-python==1.10.8",
-]
-pytest = [
-    "typeshed-stats[rich]",
     "beautifulsoup4>=4,<5",
     "covdefaults==2.3.0",
     "coverage==7.6.1",
@@ -74,22 +69,10 @@ pytest = [
     "pytest-dependency==0.6.0",
     "pytest-mock==3.14.0",
     "pytest-subtests==0.13.1",
-]
-typecheck = [
-    "typeshed-stats[rich,docs,pytest]",
     "mypy==1.11.1",
     "types-beautifulsoup4==4.12.0.20240511",
     "types-Markdown==3.6.0.20240316",
 ]
-# All of these must match .pre-commit-config.yaml
-#
-# Note that not all of the dependencies in the pre-commit config file are listed here.
-# That's deliberate (it's not necessary to run them all locally).
-# This file just lists the ones which it's convenient to have around locally.
-misc-lint = [
-    "ruff==0.6.1",
-]
-dev = ["typeshed-stats[rich,docs,typecheck,pytest,misc-lint]"]
 
 [tool.hatch.version]
 source = "vcs"