From 749b9d2fbc75732f55f1251506ddbc069568530a Mon Sep 17 00:00:00 2001 From: Johan Hidding Date: Mon, 9 Nov 2026 13:23:07 +0100 Subject: [PATCH] Upgrade GitHub Actions and use entangled-cli from PyPI Bump all actions to versions running on Node.js 24, since Node.js 20 is deprecated on GitHub runners. setup-uv no longer publishes floating major tags, so it is pinned to an exact version. entangled-cli 2.5.0 is released on PyPI, so drop the git source override. Co-Authored-By: Claude Opus 5.5 --- .github/workflows/deploy-pages.yaml | 10 +++++----- .github/workflows/python-package.yml | 4 ++-- .github/workflows/python-publish.yml | 8 ++++---- pyproject.toml | 2 -- uv.lock | 8 ++++++-- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.github/workflows/deploy-pages.yaml b/.github/workflows/deploy-pages.yaml index 97f2195..c4717f4 100644 --- a/.github/workflows/deploy-pages.yaml +++ b/.github/workflows/deploy-pages.yaml @@ -31,10 +31,10 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Install uv - uses: astral-sh/setup-uv@v6 + uses: astral-sh/setup-uv@v10.3.3 - name: Install dependencies run: uv sync @@ -43,10 +43,10 @@ jobs: run: uv run mkdocs build - name: Configure GitHub Pages - uses: actions/configure-pages@v5 + uses: actions/configure-pages@v6 - name: Upload artifact - uses: actions/upload-pages-artifact@v4 + uses: actions/upload-pages-artifact@v5 with: path: "site" @@ -59,4 +59,4 @@ jobs: steps: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v4 + uses: actions/deploy-pages@v5 diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index b3d5416..47b6c6d 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -19,10 +19,10 @@ jobs: python-version: ["3.13"] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Install uv - uses: astral-sh/setup-uv@v6 + uses: astral-sh/setup-uv@v10.3.3 - name: UV Sync run: uv sync diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 8c442bd..291d4c8 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -19,10 +19,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Install uv - uses: astral-sh/setup-uv@v6 + uses: astral-sh/setup-uv@v10.3.3 - name: UV Sync run: uv sync @@ -31,7 +31,7 @@ jobs: run: uv build - name: Upload distributions - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: release-dists path: dist/ @@ -57,7 +57,7 @@ jobs: steps: - name: Retrieve release distributions - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v8 with: name: release-dists path: dist/ diff --git a/pyproject.toml b/pyproject.toml index 1b16fdb..71998a0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,5 +43,3 @@ testpaths = [ [tool.mypy] packages = ["mkdocs_entangled"] -[tool.uv.sources] -entangled-cli = { git = "https://github.com/entangled/entangled.py" } diff --git a/uv.lock b/uv.lock index 4c89e6f..eeb0322 100644 --- a/uv.lock +++ b/uv.lock @@ -264,7 +264,7 @@ wheels = [ [[package]] name = "entangled-cli" version = "2.5.0" -source = { git = "https://github.com/entangled/entangled.py#36ba5bd84d968341cdd9db4d093650943c14a0fc" } +source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "brei" }, { name = "click" }, @@ -280,6 +280,10 @@ dependencies = [ { name = "typeguard" }, { name = "watchfiles" }, ] +sdist = { url = "https://files.pythonhosted.org/packages/6e/29/ca04e518d00457d7cf071f0bfe292c62977145b191fe780d09b006add774/entangled_cli-2.5.0.tar.gz", hash = "sha256:d1d254a574f3f362142799ce5c140604b2d5cb1619c14b0d63f746c5c891dafb", size = 48305, upload-time = "2026-10-19T14:53:38.801Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/4e/02/a90fd872f99c0f7b3a56247aa3a20a43f50aa966e601c4095556a36981c5/entangled_cli-2.5.0-py3-none-any.whl", hash = "sha256:46bacb4ba8236a6e27d17f4129127f805ec1adbf167ecbbe859a6084566f9984", size = 71600, upload-time = "2026-10-19T14:53:37.637Z" }, +] [[package]] name = "filelock" @@ -631,7 +635,7 @@ dev = [ [package.metadata] requires-dist = [ - { name = "entangled-cli", git = "https://github.com/entangled/entangled.py" }, + { name = "entangled-cli", specifier = ">=2.5,<3" }, { name = "mawk", specifier = ">=0.1.7,<0.2" }, { name = "mkdocs", specifier = ">=1.4.2,<2" }, ]