From 2aa711b7e68904fb585763e83203db8d901a8e79 Mon Sep 17 00:00:00 2001 From: TheTechromancer Date: Mon, 2 Oct 2023 05:35:23 -0400 Subject: [PATCH 1/6] fix docs publishing --- .github/workflows/tests.yml | 8 ++++++-- poetry.lock | 37 ++++++++++++++++++++++++++++++++++++- pyproject.toml | 1 + 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index cafdad982..eafd199e5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -4,6 +4,7 @@ on: branches: - stable - dev + - fix-docs-publishing pull_request: concurrency: @@ -93,8 +94,11 @@ jobs: path: .cache restore-keys: | mkdocs-material- - - run: pip install mkdocs-material mkdocs-extra-sass-plugin livereload - - run: mkdocs gh-deploy --force + - name: Install dependencies + run: | + pip install poetry + poetry install --only=docs + - run: poetry run mkdocs gh-deploy --force publish_code: needs: update_docs runs-on: ubuntu-latest diff --git a/poetry.lock b/poetry.lock index 2f1daa6c8..55c25b105 100644 --- a/poetry.lock +++ b/poetry.lock @@ -874,6 +874,21 @@ files = [ {file = "libsass-0.22.0.tar.gz", hash = "sha256:3ab5ad18e47db560f4f0c09e3d28cf3bb1a44711257488ac2adad69f4f7f8425"}, ] +[[package]] +name = "livereload" +version = "2.6.3" +description = "Python LiveReload is an awesome tool for web developers" +optional = false +python-versions = "*" +files = [ + {file = "livereload-2.6.3-py2.py3-none-any.whl", hash = "sha256:ad4ac6f53b2d62bb6ce1a5e6e96f1f00976a32348afedcb4b6d68df2a1d346e4"}, + {file = "livereload-2.6.3.tar.gz", hash = "sha256:776f2f865e59fde56490a56bcc6773b6917366bce0c267c60ee8aaf1a0959869"}, +] + +[package.dependencies] +six = "*" +tornado = {version = "*", markers = "python_version > \"2.7\""} + [[package]] name = "lockfile" version = "0.12.2" @@ -2148,6 +2163,26 @@ files = [ {file = "tomlkit-0.12.1.tar.gz", hash = "sha256:38e1ff8edb991273ec9f6181244a6a391ac30e9f5098e7535640ea6be97a7c86"}, ] +[[package]] +name = "tornado" +version = "6.3.3" +description = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed." +optional = false +python-versions = ">= 3.8" +files = [ + {file = "tornado-6.3.3-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:502fba735c84450974fec147340016ad928d29f1e91f49be168c0a4c18181e1d"}, + {file = "tornado-6.3.3-cp38-abi3-macosx_10_9_x86_64.whl", hash = "sha256:805d507b1f588320c26f7f097108eb4023bbaa984d63176d1652e184ba24270a"}, + {file = "tornado-6.3.3-cp38-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1bd19ca6c16882e4d37368e0152f99c099bad93e0950ce55e71daed74045908f"}, + {file = "tornado-6.3.3-cp38-abi3-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7ac51f42808cca9b3613f51ffe2a965c8525cb1b00b7b2d56828b8045354f76a"}, + {file = "tornado-6.3.3-cp38-abi3-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:71a8db65160a3c55d61839b7302a9a400074c9c753040455494e2af74e2501f2"}, + {file = "tornado-6.3.3-cp38-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:ceb917a50cd35882b57600709dd5421a418c29ddc852da8bcdab1f0db33406b0"}, + {file = "tornado-6.3.3-cp38-abi3-musllinux_1_1_i686.whl", hash = "sha256:7d01abc57ea0dbb51ddfed477dfe22719d376119844e33c661d873bf9c0e4a16"}, + {file = "tornado-6.3.3-cp38-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:9dc4444c0defcd3929d5c1eb5706cbe1b116e762ff3e0deca8b715d14bf6ec17"}, + {file = "tornado-6.3.3-cp38-abi3-win32.whl", hash = "sha256:65ceca9500383fbdf33a98c0087cb975b2ef3bfb874cb35b8de8740cf7f41bd3"}, + {file = "tornado-6.3.3-cp38-abi3-win_amd64.whl", hash = "sha256:22d3c2fa10b5793da13c807e6fc38ff49a4f6e1e3868b0a6f4164768bb8e20f5"}, + {file = "tornado-6.3.3.tar.gz", hash = "sha256:e7d8db41c0181c80d76c982aacc442c0783a2c54d6400fe028954201a2e032fe"}, +] + [[package]] name = "typing-extensions" version = "4.8.0" @@ -2398,4 +2433,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "fefc413a0132045bbdb1665144f272f9ca328dfc0db48926c2585a8927dd0af1" +content-hash = "2215f588e30cd553c593079522ce8b98beb344554688e62d2409237fd245f21d" diff --git a/pyproject.toml b/pyproject.toml index f8436f3bc..ee2a01c94 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -71,6 +71,7 @@ mkdocs-material = "^9.2.5" mkdocs-material-extensions = "^1.1.1" mkdocstrings = "^0.22.0" mkdocstrings-python = "^1.6.0" +livereload = "^2.6.3" [tool.pytest.ini_options] env = [ From 85ff49a9316fd85e464572a6c00407d8c94a3f3e Mon Sep 17 00:00:00 2001 From: TheTechromancer Date: Mon, 2 Oct 2023 07:23:46 -0400 Subject: [PATCH 2/6] update for current branch --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index eafd199e5..c3f7183b0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -81,7 +81,7 @@ jobs: publish_docs: needs: update_docs runs-on: ubuntu-latest - if: github.event_name == 'push' && github.ref == 'refs/heads/dev' + if: github.event_name == 'push' && (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/fix-docs-publishing') steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 From 065ae62f3e94197dd4da1ecaf701cf5c496ec24b Mon Sep 17 00:00:00 2001 From: TheTechromancer Date: Mon, 2 Oct 2023 10:04:45 -0400 Subject: [PATCH 3/6] fix tests --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c3f7183b0..5a8f7249a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -54,7 +54,7 @@ jobs: update_docs: needs: test runs-on: ubuntu-latest - if: github.event_name == 'push' && (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/stable') + if: github.event_name == 'push' && (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/stable || github.ref == 'refs/heads/fix-docs-publishing') steps: - uses: actions/checkout@v3 with: From 70b029e0183fabd31b0c2bce4beafbed88efa6ed Mon Sep 17 00:00:00 2001 From: TheTechromancer Date: Mon, 2 Oct 2023 10:09:14 -0400 Subject: [PATCH 4/6] tests troubleshooting --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5a8f7249a..15da93837 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -54,7 +54,7 @@ jobs: update_docs: needs: test runs-on: ubuntu-latest - if: github.event_name == 'push' && (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/stable || github.ref == 'refs/heads/fix-docs-publishing') + if: github.event_name == 'push' && (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/fix-docs-publishing') steps: - uses: actions/checkout@v3 with: From 2e8d17eaa520eed5197d53e46ec5671c2aa6ad26 Mon Sep 17 00:00:00 2001 From: TheTechromancer Date: Tue, 3 Oct 2023 04:37:19 -0400 Subject: [PATCH 5/6] fix test dedup concurrency --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 15da93837..308d4f12a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,8 +7,8 @@ on: - fix-docs-publishing pull_request: -concurrency: - group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.ref }} +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.head.sha || github.sha }} cancel-in-progress: true jobs: From e2d887c775a65b464986ba49824e2b2d19da28c9 Mon Sep 17 00:00:00 2001 From: TheTechromancer Date: Tue, 3 Oct 2023 05:01:54 -0400 Subject: [PATCH 6/6] restore branch criteria --- .github/workflows/tests.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 308d4f12a..7e2c395f7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -4,11 +4,10 @@ on: branches: - stable - dev - - fix-docs-publishing pull_request: -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.head.sha || github.sha }} +concurrency: + group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true jobs: @@ -54,7 +53,7 @@ jobs: update_docs: needs: test runs-on: ubuntu-latest - if: github.event_name == 'push' && (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/fix-docs-publishing') + if: github.event_name == 'push' && (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/stable') steps: - uses: actions/checkout@v3 with: @@ -81,7 +80,7 @@ jobs: publish_docs: needs: update_docs runs-on: ubuntu-latest - if: github.event_name == 'push' && (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/fix-docs-publishing') + if: github.event_name == 'push' && (github.ref == 'refs/heads/dev') steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4