From 4e2addbde4068c186cf1be4bbecc359948d10b7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 8 Jan 2025 23:44:04 +0200 Subject: [PATCH 1/3] Use sphinx from pip Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- .github/workflows/docs-build.yml | 9 ++++++--- .github/workflows/docs-upload.yml | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml index caadc1a..6835aac 100644 --- a/.github/workflows/docs-build.yml +++ b/.github/workflows/docs-build.yml @@ -36,9 +36,12 @@ jobs: echo "__version__ = '$version'" | tee trakt/__version__.py python -c "from trakt import __version__; print(__version__)" - # Install deps and build docs - pip install -r requirements.txt - sudo apt install sphinx + # Install deps + python -m pip install --upgrade pip + python -m pip install -r requirements.txt + python -m pip install 'sphinx>=7.1.0' + + # Build docs make docs # vim:ts=2:sw=2:et diff --git a/.github/workflows/docs-upload.yml b/.github/workflows/docs-upload.yml index 002afca..f615774 100644 --- a/.github/workflows/docs-upload.yml +++ b/.github/workflows/docs-upload.yml @@ -50,9 +50,12 @@ jobs: cat trakt/__version__.py python -c "from trakt import __version__; print(__version__)" - # Install deps and build docs - pip install -r requirements.txt - sudo apt install sphinx + # Install deps + python -m pip install --upgrade pip + python -m pip install -r requirements.txt + python -m pip install 'sphinx>=7.1.0' + + # Build docs make docs - name: Setup Pages From c083a9681b992d91cc6d708d49c2dfb0a7050f6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 8 Jan 2025 23:48:27 +0200 Subject: [PATCH 2/3] Use tee rather direction --- .github/workflows/docs-upload.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docs-upload.yml b/.github/workflows/docs-upload.yml index f615774..26f3c18 100644 --- a/.github/workflows/docs-upload.yml +++ b/.github/workflows/docs-upload.yml @@ -46,8 +46,7 @@ jobs: run: | # Setup version version=$(git describe --tags --abbrev=0) - echo "__version__ = '$version'" > trakt/__version__.py - cat trakt/__version__.py + echo "__version__ = '$version'" | tee trakt/__version__.py python -c "from trakt import __version__; print(__version__)" # Install deps From a5b5b128a8915a258ea63f6e3cd2918be35c2666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 8 Jan 2025 23:48:46 +0200 Subject: [PATCH 3/3] Enable shell tracing --- .github/workflows/docs-upload.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docs-upload.yml b/.github/workflows/docs-upload.yml index 26f3c18..37186c7 100644 --- a/.github/workflows/docs-upload.yml +++ b/.github/workflows/docs-upload.yml @@ -44,6 +44,8 @@ jobs: - name: Install dependencies and build docs run: | + set -eux + # Setup version version=$(git describe --tags --abbrev=0) echo "__version__ = '$version'" | tee trakt/__version__.py