From 93c093581187626c90cca742df6ac0453202a64b Mon Sep 17 00:00:00 2001 From: XyDrKRulof Date: Wed, 29 May 2024 11:40:27 +0200 Subject: [PATCH 1/8] Potential fix to Python 3.8 being deprecated for Sphinx-Build --- .github/workflows/build_and_test.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index fb4cff99..f3c9679a 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -31,15 +31,12 @@ jobs: - name: Test with pytest env: PY_VER: ${{ matrix.python-version }} - run: | - if [[ "$PY_VER" = "3.7" ]]; then pytest --cov=gym_electric_motor tests/; else pytest; fi - if [[ "$PY_VER" = "3.7" ]]; then bash <(curl -s https://codecov.io/bash); fi # code coverage report upload build-doc: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - name: Build Sphinx documentation - uses: ammaraskar/sphinx-action@master + uses: josh146/sphinx-action@master with: pre-build-command: "python -m pip install sphinx m2r2 sphinx_rtd_theme==1.3.0 && python -m pip install -r requirements.txt & python -m pip install ." docs-folder: "docs/" From 8fb4bd67e1ece483e71b33a2fc5092f9035c8a80 Mon Sep 17 00:00:00 2001 From: XyDrKRulof Date: Wed, 29 May 2024 11:46:17 +0200 Subject: [PATCH 2/8] Entered pytest again --- .github/workflows/build_and_test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index f3c9679a..3cab26f2 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -31,6 +31,8 @@ jobs: - name: Test with pytest env: PY_VER: ${{ matrix.python-version }} + run: | + pytest; fi build-doc: runs-on: ubuntu-latest steps: From a838ed76d4c6a8147517a57bdc706257c6d7882f Mon Sep 17 00:00:00 2001 From: XyDrKRulof Date: Wed, 29 May 2024 11:48:58 +0200 Subject: [PATCH 3/8] Pytest syntax error fix --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 3cab26f2..bd24ac96 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -32,7 +32,7 @@ jobs: env: PY_VER: ${{ matrix.python-version }} run: | - pytest; fi + pytest build-doc: runs-on: ubuntu-latest steps: From 4f3752e52dfcca5da16f739a501607a06ae1b05f Mon Sep 17 00:00:00 2001 From: XyDrKRulof Date: Wed, 29 May 2024 12:05:42 +0200 Subject: [PATCH 4/8] Possible Dependency Fix --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index bd24ac96..cd3baad8 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -40,7 +40,7 @@ jobs: - name: Build Sphinx documentation uses: josh146/sphinx-action@master with: - pre-build-command: "python -m pip install sphinx m2r2 sphinx_rtd_theme==1.3.0 && python -m pip install -r requirements.txt & python -m pip install ." + pre-build-command: "python -m pip install sphinx m2r2 sphinx_rtd_theme==1.3.0 && pip install --upgrade jinja2 && python -m pip install -r requirements.txt & python -m pip install ." docs-folder: "docs/" # Publish built docs to gh-pages branch. # =============================== From 97d9146c170d3304d2a18285a690b6f65a1b8251 Mon Sep 17 00:00:00 2001 From: XyDrKRulof Date: Wed, 29 May 2024 12:08:01 +0200 Subject: [PATCH 5/8] Trying to upgrade all packages again. If that fails, different measures will have to be taken. --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index cd3baad8..d8ad8b8f 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -40,7 +40,7 @@ jobs: - name: Build Sphinx documentation uses: josh146/sphinx-action@master with: - pre-build-command: "python -m pip install sphinx m2r2 sphinx_rtd_theme==1.3.0 && pip install --upgrade jinja2 && python -m pip install -r requirements.txt & python -m pip install ." + pre-build-command: "python -m pip install --upgrade sphinx m2r2 sphinx_rtd_theme && python -m pip install -r requirements.txt & python -m pip install ." docs-folder: "docs/" # Publish built docs to gh-pages branch. # =============================== From 720cce27b42e4d5f4924dd381886f0ac5309c43c Mon Sep 17 00:00:00 2001 From: XyDrKRulof Date: Wed, 29 May 2024 12:11:28 +0200 Subject: [PATCH 6/8] Trying another docker file --- .github/workflows/build_and_test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index d8ad8b8f..b20ad816 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -38,9 +38,9 @@ jobs: steps: - uses: actions/checkout@v3 - name: Build Sphinx documentation - uses: josh146/sphinx-action@master + uses: Queens-Physics/sphinx-action@master with: - pre-build-command: "python -m pip install --upgrade sphinx m2r2 sphinx_rtd_theme && python -m pip install -r requirements.txt & python -m pip install ." + pre-build-command: "python -m pip install sphinx m2r2 sphinx_rtd_theme==1.3.0 && python -m pip install -r requirements.txt & python -m pip install ." docs-folder: "docs/" # Publish built docs to gh-pages branch. # =============================== From 007363e632c34ad8df9266230e2ab2fcfa605dcc Mon Sep 17 00:00:00 2001 From: XyDrKRulof Date: Wed, 29 May 2024 12:39:23 +0200 Subject: [PATCH 7/8] Using a newer Sphinx Docker Version --- .github/workflows/build_and_test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index b20ad816..c9bc8771 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -38,9 +38,9 @@ jobs: steps: - uses: actions/checkout@v3 - name: Build Sphinx documentation - uses: Queens-Physics/sphinx-action@master + uses: nicholasphair/sphinx-action@7.0.0 with: - pre-build-command: "python -m pip install sphinx m2r2 sphinx_rtd_theme==1.3.0 && python -m pip install -r requirements.txt & python -m pip install ." + pre-build-command: "python -m pip install sphinx m2r2 sphinx_rtd_theme==1.3.0 && python -m pip install -r requirements.txt & python -m pip install ." docs-folder: "docs/" # Publish built docs to gh-pages branch. # =============================== From ce1922d9149c8d1d364c1f95503daa4197523611 Mon Sep 17 00:00:00 2001 From: XyDrKRulof Date: Wed, 29 May 2024 12:44:53 +0200 Subject: [PATCH 8/8] Potential fix to the GitHub Action not waiting for the pip installation to finish --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index c9bc8771..2fe4a843 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -40,7 +40,7 @@ jobs: - name: Build Sphinx documentation uses: nicholasphair/sphinx-action@7.0.0 with: - pre-build-command: "python -m pip install sphinx m2r2 sphinx_rtd_theme==1.3.0 && python -m pip install -r requirements.txt & python -m pip install ." + pre-build-command: "python -m pip install sphinx m2r2 sphinx_rtd_theme==1.3.0 && python -m pip install -r requirements.txt && python -m pip install ." docs-folder: "docs/" # Publish built docs to gh-pages branch. # ===============================