From 5c6a47b54cfbba321f0ccd8a20fec57fb1396002 Mon Sep 17 00:00:00 2001 From: Maciej Olko Date: Tue, 4 Feb 2025 15:00:24 +0100 Subject: [PATCH 1/5] Use maciek/potodo:merge-with-polib --- generate.py | 1 + 1 file changed, 1 insertion(+) diff --git a/generate.py b/generate.py index 237e12f7e..7177ba7c5 100644 --- a/generate.py +++ b/generate.py @@ -7,6 +7,7 @@ # "requests", # "docutils", # ] +# potodo = { git = "https://git.afpy.org/AFPy/maciek/potodo", branch = "merge-with-polib" } # /// import subprocess from collections.abc import Iterator From 31c2535d04251f89c1e6181026cd67f142b6d95d Mon Sep 17 00:00:00 2001 From: Maciej Olko Date: Tue, 4 Feb 2025 16:31:16 +0100 Subject: [PATCH 2/5] Fix dependency specification --- generate.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/generate.py b/generate.py index 7177ba7c5..f335f4e0c 100644 --- a/generate.py +++ b/generate.py @@ -7,7 +7,9 @@ # "requests", # "docutils", # ] -# potodo = { git = "https://git.afpy.org/AFPy/maciek/potodo", branch = "merge-with-polib" } +# +# [tool.uv.sources] +# potodo = { git = "https://git.afpy.org/maciek/potodo.git", branch = "merge-with-polib" } # /// import subprocess from collections.abc import Iterator From 5f2773801f510d735cdbd52202513eda2cbef701 Mon Sep 17 00:00:00 2001 From: Maciej Olko Date: Tue, 4 Feb 2025 17:12:03 +0100 Subject: [PATCH 3/5] Remove Gettext installation in GitHub workflow --- .github/workflows/update.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 23259e2fe..59b6ab09e 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -17,7 +17,6 @@ jobs: python-version: "3.x" - uses: astral-sh/setup-uv@v5 - uses: actions/checkout@v4 - - run: sudo apt-get install -y gettext - run: uv run generate.py # generates "index.html" - run: mkdir -p build && cp index.html style.css build - name: Deploy 🚀 From baef8520b1b46d9e1bdc00dc8a9f5b8ae9c6329a Mon Sep 17 00:00:00 2001 From: Maciej Olko Date: Tue, 4 Feb 2025 17:13:03 +0100 Subject: [PATCH 4/5] Remove Gettext installation from .readthedocs.yaml --- .readthedocs.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 59be58c86..2659b9827 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -8,8 +8,6 @@ build: os: ubuntu-24.04 tools: python: "3" - apt_packages: - - gettext jobs: post_checkout: [] install: From 5fbc59b9578804b99b281102b928bdc3042f1866 Mon Sep 17 00:00:00 2001 From: Maciej Olko Date: Tue, 4 Feb 2025 18:28:21 +0100 Subject: [PATCH 5/5] Revert .readthedocs.yaml to simplified version --- .readthedocs.yaml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 2659b9827..7d3909c07 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -8,15 +8,10 @@ build: os: ubuntu-24.04 tools: python: "3" - jobs: - post_checkout: [] - install: - - asdf plugin add uv - - asdf install uv latest - pre_build: - - asdf global uv latest - build: - html: - - uv run generate.py - - mkdir -p _readthedocs/html - - mv index.html style.css _readthedocs/html + commands: + - asdf plugin add uv + - asdf install uv latest + - asdf global uv latest + - uv run generate.py + - mkdir -p _readthedocs/html + - mv index.html style.css _readthedocs/html