Merge pull request #169 from pradyunsg/updates

Update dependencies and other installation improvements

Author: pradyunsg

.github/workflows/ci.yaml

@@ -12,38 +12,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-      - uses: pre-commit/[email protected]
+      - uses: astral-sh/setup-uv@v5
+      - run: uvx pre-commit run --all-files --show-diff-on-failure
 
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-        with:
-           python-version: "3.10"
-
-      # pip caching
-      - name: Locate pip's cache
-        id: pip-cache
-        run: echo "::set-output name=dir::$(pip cache dir)"
-
-      - name: Persist cache across runs
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.pip-cache.outputs.dir }}
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-
-      # Install runtime dependencies
-      - name: Upgrade pip
-        run: pip install --upgrade pip
-      - name: Install nox
-        run: pip install nox
-
-      - name: Render entire site
-        run: nox -s publish
+      - uses: actions/checkout@v4
+      - uses: astral-sh/setup-uv@v5
+      - run: uvx nox --default-venv-backend uv -s publish
 
       # Publish!
       - name: Deploy to GitHub Pages

.pre-commit-config.yaml

@@ -1,34 +1,29 @@
 repos:
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.9.10
+    hooks:
+      - id: ruff
+      - id: ruff-format
 
-- repo: https://github.com/psf/black
-  rev: 23.1.0
-  hooks:
-    - id: black
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: check-builtin-literals
+      - id: check-added-large-files
+      - id: check-case-conflict
+      - id: check-toml
+      - id: check-yaml
+      - id: debug-statements
+      - id: end-of-file-fixer
+      - id: forbid-new-submodules
+      - id: trailing-whitespace
 
-- repo: https://github.com/timothycrosley/isort
-  rev: 5.12.0
-  hooks:
-  - id: isort
-
-- repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: 'v4.4.0'
-  hooks:
-    - id: check-builtin-literals
-    - id: check-added-large-files
-    - id: check-case-conflict
-    - id: check-toml
-    - id: check-yaml
-    - id: debug-statements
-    - id: end-of-file-fixer
-    - id: forbid-new-submodules
-    - id: trailing-whitespace
-
-- repo: local
-  hooks:
-  - id: sort-json
-    name: Sort theme.json
-    language: python
-    pass_filenames: false
-    types: []
-    always_run: true
-    entry: python tools/sort-json.py
+  - repo: local
+    hooks:
+      - id: sort-json
+        name: Sort theme.json
+        language: python
+        pass_filenames: false
+        types: []
+        always_run: true
+        entry: python tools/sort-json.py

noxfile.py

@@ -1,14 +1,10 @@
-import shutil
-import subprocess
-import sys
-
 import nox
 
 
 @nox.session
 def update(session):
     session.install("pip-tools")
-    session.run("pip-compile")
+    session.run("pip-compile", "requirements.in", "--upgrade")
 
 
 @nox.session(name="list", reuse_venv=True)

requirements.txt

@@ -1,30 +1,28 @@
 #
-# This file is autogenerated by pip-compile with python 3.10
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.13
+# by the following command:
 #
-#    pip-compile
+#    pip-compile requirements.in
 #
-colorama==0.4.4
-    # via rich
-commonmark==0.9.1
-    # via rich
-greenlet==1.1.2
+greenlet==3.1.1
     # via playwright
-jinja2==2.11.3
+jinja2==3.1.6
     # via -r requirements.in
-markupsafe==1.1.1
+markdown-it-py==3.0.0
+    # via rich
+markupsafe==3.0.2
     # via jinja2
-pillow==10.2.0
+mdurl==0.1.2
+    # via markdown-it-py
+pillow==11.1.0
     # via -r requirements.in
-playwright==1.17.0
+playwright==1.50.0
     # via -r requirements.in
-pyee==8.1.0
+pyee==12.1.1
     # via playwright
-pygments==2.15.0
+pygments==2.19.1
     # via rich
-rich==10.1.0
+rich==13.9.4
     # via -r requirements.in
-typing-extensions==3.7.4.3
-    # via rich
-websockets==10.1
-    # via playwright
+typing-extensions==4.12.2
+    # via pyee

src/generate_sample_sites.py

@@ -5,6 +5,7 @@
 from pathlib import Path
 
 import rich.progress
+import rich.traceback
 from jinja2 import Template
 
 from .constants import BUILD, DESTINATION, TEMPLATES
@@ -76,7 +77,7 @@ async def generate_site(
             ]
             raise Exception("\n".join(message))
     except Exception as e:
-        progress.log(f"Fail: [red]{theme.name}[reset]\n\t{e}")
+        progress.log(f"Fail: [red]{theme.name}[reset]", rich.traceback.Traceback())
         destination_path.mkdir(parents=True, exist_ok=True)
         (destination_path / "index.html").write_text(get_error_page(theme, e))
     else:

src/generate_screenshots.py

@@ -1,10 +1,8 @@
 """Script to generate the screenshots for all the themes."""
 
 import asyncio
-import contextlib
 import functools
 import io
-import textwrap
 from typing import Dict, Tuple
 
 import rich

src/isolation.py

@@ -1,10 +1,6 @@
-"""Manage isolated virtual environments for each build.
-"""
+"""Manage isolated virtual environments for each build."""
 
 import asyncio
-import os
-import shutil
-import subprocess
 import sys
 
 from .constants import BUILD
@@ -28,9 +24,10 @@ async def create(self, *, delete=False):
             return
 
         process = await asyncio.create_subprocess_exec(
-            sys.executable,
-            "-m",
+            "uv",
             "venv",
+            "--python",
+            sys.executable,
             str(self.path),
             stdout=asyncio.subprocess.DEVNULL,
             stderr=asyncio.subprocess.DEVNULL,
@@ -40,19 +37,13 @@ async def create(self, *, delete=False):
             raise RuntimeError("Could not create virtual environment.")
 
     async def install(self, *args, **kwargs):
-        returncode, _ = await self.run("pip", "install", *args, **kwargs)
+        returncode, _ = await self.run("uv", "pip", "install", *args, **kwargs)
         if returncode:
             raise RuntimeError(f"Could not install: {' '.join(args)}")
 
-    async def run(self, *args, external=False, env={}):
-        assert args
-
-        locations = [str(path.resolve()) for path in self.bin_paths]
-        executable_path = shutil.which(args[0], path=os.pathsep.join(locations))
-
+    async def run(self, *args, env=None):
         process = await asyncio.create_subprocess_exec(
-            executable_path,
-            *args[1:],
+            *args,
             env=env,
             stdout=asyncio.subprocess.PIPE,
             stderr=asyncio.subprocess.PIPE,

src/templates/conf.template.py

@@ -1,7 +1,5 @@
-import textwrap
-
 from docutils import nodes
-from docutils.parsers.rst import Directive, directives
+from docutils.parsers.rst import Directive
 from docutils.statemachine import StringList
 
 # -- Common stuff -------------------------------------------------------------