From c81995ed41822718315218265e931c9e58d48ee6 Mon Sep 17 00:00:00 2001 From: Tim Welch Date: Mon, 13 Sep 2021 20:34:26 -0700 Subject: [PATCH 01/10] fix --- .github/workflows/pr-test-docs.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr-test-docs.yml b/.github/workflows/pr-test-docs.yml index 5b2d033..77dd1e3 100644 --- a/.github/workflows/pr-test-docs.yml +++ b/.github/workflows/pr-test-docs.yml @@ -6,7 +6,11 @@ jobs: docs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 + - name: Set up Python 3.9 + uses: actions/setup-python@v2 + with: + python-version: 3.9 - name: Install dependencies run: | python -m pip install -r requirements_dev.txt From 5d7e94072750c83180c681131542a7dc3b9bd686 Mon Sep 17 00:00:00 2001 From: Tim Welch Date: Thu, 16 Sep 2021 13:22:11 -0700 Subject: [PATCH 02/10] try PYTHONPATH instead of editable install --- .github/workflows/master-publish-docs.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/master-publish-docs.yml b/.github/workflows/master-publish-docs.yml index f5f6520..96c9b58 100644 --- a/.github/workflows/master-publish-docs.yml +++ b/.github/workflows/master-publish-docs.yml @@ -15,7 +15,6 @@ jobs: - name: Install dependencies run: | python -m pip install -r requirements_dev.txt - python -m pip install -e . - name: Replace html dir with worktree run: | rm -rf docs/_build/html @@ -24,6 +23,9 @@ jobs: - uses: ammaraskar/sphinx-action@master with: docs-folder: "docs/" + env: + PYTHONPATH: '/work/lib' + - name: Commit worktree to gh-pages env: THE_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 5c749321fe40a2edbec50ab13b3de8783782715b Mon Sep 17 00:00:00 2001 From: Tim Welch Date: Thu, 16 Sep 2021 13:24:41 -0700 Subject: [PATCH 03/10] add to PR test also --- .github/workflows/pr-test-docs.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-test-docs.yml b/.github/workflows/pr-test-docs.yml index 77dd1e3..6f26e61 100644 --- a/.github/workflows/pr-test-docs.yml +++ b/.github/workflows/pr-test-docs.yml @@ -14,7 +14,8 @@ jobs: - name: Install dependencies run: | python -m pip install -r requirements_dev.txt - python -m pip install -e . - uses: ammaraskar/sphinx-action@master with: - docs-folder: "docs/" \ No newline at end of file + docs-folder: "docs/" + env: + PYTHONPATH: '/work/lib' \ No newline at end of file From 90f29ba5e0b2d91d0c5e6b7d910e5136f30e4f19 Mon Sep 17 00:00:00 2001 From: Tim Welch Date: Thu, 16 Sep 2021 13:29:46 -0700 Subject: [PATCH 04/10] switch to passing PYTHONPATH in custom build command --- .github/workflows/master-publish-docs.yml | 3 +-- .github/workflows/pr-test-docs.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/master-publish-docs.yml b/.github/workflows/master-publish-docs.yml index 96c9b58..e5e07d2 100644 --- a/.github/workflows/master-publish-docs.yml +++ b/.github/workflows/master-publish-docs.yml @@ -23,8 +23,7 @@ jobs: - uses: ammaraskar/sphinx-action@master with: docs-folder: "docs/" - env: - PYTHONPATH: '/work/lib' + build-command: "PYTHONPATH=/work/lib make html" - name: Commit worktree to gh-pages env: diff --git a/.github/workflows/pr-test-docs.yml b/.github/workflows/pr-test-docs.yml index 6f26e61..fac9e03 100644 --- a/.github/workflows/pr-test-docs.yml +++ b/.github/workflows/pr-test-docs.yml @@ -17,5 +17,4 @@ jobs: - uses: ammaraskar/sphinx-action@master with: docs-folder: "docs/" - env: - PYTHONPATH: '/work/lib' \ No newline at end of file + build-command: "PYTHONPATH=/work/lib make html" From 1f494ac79bc4dfbaf58b5193393a7d8b2bcbe416 Mon Sep 17 00:00:00 2001 From: Tim Welch Date: Thu, 16 Sep 2021 14:15:20 -0700 Subject: [PATCH 05/10] try global env var for PYTHONPATH --- .github/workflows/pr-test-docs.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr-test-docs.yml b/.github/workflows/pr-test-docs.yml index fac9e03..8ef4a98 100644 --- a/.github/workflows/pr-test-docs.yml +++ b/.github/workflows/pr-test-docs.yml @@ -2,6 +2,9 @@ name: "Test Docs" on: - pull_request +env: + PYTHONPATH: '"$GITHUB_WORKSPACE"/lib' + jobs: docs: runs-on: ubuntu-latest @@ -17,4 +20,4 @@ jobs: - uses: ammaraskar/sphinx-action@master with: docs-folder: "docs/" - build-command: "PYTHONPATH=/work/lib make html" + build-command: "make html" From 961baa2a175fc91e8cb96ba179db1f21258b4bd2 Mon Sep 17 00:00:00 2001 From: Tim Welch Date: Thu, 16 Sep 2021 14:20:44 -0700 Subject: [PATCH 06/10] try static workspace path --- .github/workflows/pr-test-docs.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/pr-test-docs.yml b/.github/workflows/pr-test-docs.yml index 8ef4a98..f34cf6f 100644 --- a/.github/workflows/pr-test-docs.yml +++ b/.github/workflows/pr-test-docs.yml @@ -2,9 +2,6 @@ name: "Test Docs" on: - pull_request -env: - PYTHONPATH: '"$GITHUB_WORKSPACE"/lib' - jobs: docs: runs-on: ubuntu-latest @@ -20,4 +17,4 @@ jobs: - uses: ammaraskar/sphinx-action@master with: docs-folder: "docs/" - build-command: "make html" + build-command: "PYTHONPATH=/home/runner/work/python-sap-map/python-sap-map/lib make html" From d3d2339c7f6f25599ac39bb4d1bc105f3786f0c8 Mon Sep 17 00:00:00 2001 From: Tim Welch Date: Thu, 16 Sep 2021 14:28:15 -0700 Subject: [PATCH 07/10] try as env again --- .github/workflows/pr-test-docs.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr-test-docs.yml b/.github/workflows/pr-test-docs.yml index f34cf6f..c5dcc7e 100644 --- a/.github/workflows/pr-test-docs.yml +++ b/.github/workflows/pr-test-docs.yml @@ -15,6 +15,7 @@ jobs: run: | python -m pip install -r requirements_dev.txt - uses: ammaraskar/sphinx-action@master + env: + PYTHONPATH: /home/runner/work/python-sap-map/python-sap-map/lib with: docs-folder: "docs/" - build-command: "PYTHONPATH=/home/runner/work/python-sap-map/python-sap-map/lib make html" From 76e18bad01d9dd129427e5aefdcd23fab864edbc Mon Sep 17 00:00:00 2001 From: Tim Welch Date: Thu, 16 Sep 2021 14:32:19 -0700 Subject: [PATCH 08/10] add back main install main requirements --- .github/workflows/pr-test-docs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr-test-docs.yml b/.github/workflows/pr-test-docs.yml index c5dcc7e..9a0f828 100644 --- a/.github/workflows/pr-test-docs.yml +++ b/.github/workflows/pr-test-docs.yml @@ -13,6 +13,7 @@ jobs: python-version: 3.9 - name: Install dependencies run: | + python -m pip install -r requirements.txt python -m pip install -r requirements_dev.txt - uses: ammaraskar/sphinx-action@master env: From 388895b9e3fa2dd095334495d7b6f52f3bb87d22 Mon Sep 17 00:00:00 2001 From: Tim Welch Date: Thu, 16 Sep 2021 14:35:42 -0700 Subject: [PATCH 09/10] drop python 3.9 --- .github/workflows/pr-test-docs.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/pr-test-docs.yml b/.github/workflows/pr-test-docs.yml index 9a0f828..85ebf55 100644 --- a/.github/workflows/pr-test-docs.yml +++ b/.github/workflows/pr-test-docs.yml @@ -7,10 +7,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up Python 3.9 - uses: actions/setup-python@v2 - with: - python-version: 3.9 - name: Install dependencies run: | python -m pip install -r requirements.txt From f7812e528115b8387807406fb7caaf3e7124e5f3 Mon Sep 17 00:00:00 2001 From: Tim Welch Date: Thu, 16 Sep 2021 14:38:26 -0700 Subject: [PATCH 10/10] add site-packages cause maybe we're overwriting --- .github/workflows/pr-test-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-test-docs.yml b/.github/workflows/pr-test-docs.yml index 85ebf55..ed4bf29 100644 --- a/.github/workflows/pr-test-docs.yml +++ b/.github/workflows/pr-test-docs.yml @@ -13,6 +13,6 @@ jobs: python -m pip install -r requirements_dev.txt - uses: ammaraskar/sphinx-action@master env: - PYTHONPATH: /home/runner/work/python-sap-map/python-sap-map/lib + PYTHONPATH: /home/runner/work/python-sap-map/python-sap-map/lib:/usr/local/lib/python3.8/site-packages with: docs-folder: "docs/"