Use uv (#14)

lukasturcani · Nov 14, 2024 · 5f8768c · 5f8768c
1 parent ed73045
commit 5f8768c
Show file tree

Hide file tree

Showing 6 changed files with 802 additions and 42 deletions.
diff --git a/.github/workflows/publish_release.yaml b/.github/workflows/publish_release.yaml
@@ -10,14 +10,11 @@ jobs:
       VERSION: ${{ github.ref_name }}
     steps:
       - uses: actions/checkout@v4
+      - uses: astral-sh/setup-uv@v3
+        with:
+          enable-cache: true
+          cache-dependency-glob: "uv.lock"
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
-          cache: "pip"
-      - run: pip install -e '.[dev]'
-      - run: python -m build
-      - run:
-          twine upload
-          -u __token__
-          -p ${{ secrets.PYPI_API_TOKEN }}
-          dist/*
+          python-version-file: "pyproject.toml"
+      - run: uv publish
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -11,43 +11,55 @@ jobs:
   ruff:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: astral-sh/setup-uv@v3
         with:
-          python-version: "3.11"
-          cache: "pip"
-      - run: "pip install -e '.[dev]'"
-      - run: ruff check src/ tests/
+          enable-cache: true
+          cache-dependency-glob: "uv.lock"
+      - uses: actions/setup-python@v5
+        with:
+          python-version-file: "pyproject.toml"
+      - run: uv sync --all-extras --dev
+      - run: uv run ruff check src/ tests/
 
   mypy:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: astral-sh/setup-uv@v3
+        with:
+          enable-cache: true
+          cache-dependency-glob: "uv.lock"
+      - uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
-          cache: "pip"
-      - run: "pip install -e '.[dev]'"
-      - run: mypy src/ tests/
+          python-version-file: "pyproject.toml"
+      - run: uv sync --all-extras --dev
+      - run: uv run mypy src/ tests/
 
   ruff-format:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: astral-sh/setup-uv@v3
         with:
-          python-version: "3.11"
-          cache: "pip"
-      - run: "pip install -e '.[dev]'"
-      - run: ruff format --check src/ tests/
+          enable-cache: true
+          cache-dependency-glob: "uv.lock"
+      - uses: actions/setup-python@v5
+        with:
+          python-version-file: "pyproject.toml"
+      - run: uv sync --all-extras --dev
+      - run: uv run ruff format --check src/ tests/
 
   examples:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: astral-sh/setup-uv@v3
+        with:
+          enable-cache: true
+          cache-dependency-glob: "uv.lock"
+      - uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
-          cache: "pip"
-      - run: "pip install -e '.[dev]'"
-      - run: make -C tests html
+          python-version-file: "pyproject.toml"
+      - run: uv sync --all-extras --dev
+      - run: uv run make -C tests html
diff --git a/justfile b/justfile
@@ -4,7 +4,7 @@ default:
 
 # Do a dev install.
 dev:
-  pip install -e '.[dev]'
+  uv sync --all-extras --dev
 
 # Run code checks.
 check:
@@ -14,19 +14,19 @@ check:
   trap error=1 ERR
 
   echo
-  (set -x; ruff check src/ tests/ )
+  (set -x; uv run ruff check src/ tests/ )
   test $? = 0
 
   echo
-  ( set -x; ruff format --check src/ tests/ )
+  ( set -x; uv run ruff format --check src/ tests/ )
   test $? = 0
 
   echo
-  ( set -x; mypy src/ tests/ )
+  ( set -x; uv run mypy src/ tests/ )
   test $? = 0
 
   echo
-  ( set -x; make -C tests html )
+  ( set -x; uv run make -C tests html )
   test $? = 0
 
   test $error = 0

diff --git a/pyproject.toml b/pyproject.toml
@@ -10,12 +10,12 @@ maintainers = [
 dependencies = [
   "sphinx",
 ]
-requires-python = ">=3.10"
+requires-python = ">=3.12"
 dynamic = ["version"]
 readme = "README.rst"
 description = "Make better chemistry documentation!"
 
-[project.optional-dependencies]
+[dependency-groups]
 dev = [
   "ruff",
   "mypy",

diff --git a/src/moldoc/_internal/molecule.py b/src/moldoc/_internal/molecule.py
@@ -1,5 +1,4 @@
 from collections.abc import Iterable
-from typing import TypeAlias
 
 
 class Color:
@@ -162,7 +161,7 @@ def get_flat_shading(self) -> bool | None:
         return self._flat_shading
 
 
-Material: TypeAlias = (
+type Material = (
     MeshLambertMaterial
     | MeshNormalMaterial
     | MeshPhongMaterial