From 625994ae9eee74c857c79f7ca790a30486bf23fd Mon Sep 17 00:00:00 2001 From: Andrew Pikul Date: Mon, 3 Mar 2025 14:29:22 -0500 Subject: [PATCH 1/7] Make error more verbose --- src/py/kaleido/_mocker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/py/kaleido/_mocker.py b/src/py/kaleido/_mocker.py index dc3978e7..6280e661 100644 --- a/src/py/kaleido/_mocker.py +++ b/src/py/kaleido/_mocker.py @@ -158,7 +158,7 @@ def _load_figures_from_paths(paths: list[Path]): args = parser.parse_args() if not Path(args.output).is_dir(): - raise ValueError("Specified output must be existing directory.") + raise ValueError(f"Specified output must be existing directory. Is {args.output!s}") # Function to process the images From a2f605b656de08e87aff29f1ba623c70990e9194 Mon Sep 17 00:00:00 2001 From: Andrew Pikul Date: Mon, 3 Mar 2025 14:40:04 -0500 Subject: [PATCH 2/7] Allow manual running of big test --- .github/workflows/publish_testpypi.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish_testpypi.yml b/.github/workflows/publish_testpypi.yml index 254270e8..c3264147 100644 --- a/.github/workflows/publish_testpypi.yml +++ b/.github/workflows/publish_testpypi.yml @@ -2,6 +2,7 @@ --- name: test-n-build on: + workflow_dispatch: push: tags: - v* @@ -77,7 +78,11 @@ jobs: working-directory: ./src/py/ name: Upload release to TestPyPI needs: super-test - if: always() && !cancelled() && !failure() + if: | + always() && + !cancelled() && + !failure() && + startsWith(github.ref, 'refs/tags/') runs-on: ubuntu-latest environment: name: testpypi From 4c9559abf778082b9b976a7938b6326d690ebae4 Mon Sep 17 00:00:00 2001 From: Andrew Pikul Date: Mon, 3 Mar 2025 14:53:26 -0500 Subject: [PATCH 3/7] Manually set output dir in mocktest --- .github/workflows/publish_testpypi.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish_testpypi.yml b/.github/workflows/publish_testpypi.yml index c3264147..3aaf4874 100644 --- a/.github/workflows/publish_testpypi.yml +++ b/.github/workflows/publish_testpypi.yml @@ -51,6 +51,7 @@ jobs: --logistro-level INFO --n 1 --timeout 200 + --output ${GITHUB_WORKSPACE}/integration_tests/renders/ - name: Test if: ${{ ! runner.debug && matrix.os != 'ubuntu-latest' }} From 5b9e603f5fa7046425f9049a6369e47fadcbe275 Mon Sep 17 00:00:00 2001 From: Andrew Pikul Date: Mon, 3 Mar 2025 14:57:39 -0500 Subject: [PATCH 4/7] Update output dir again --- .github/workflows/publish_testpypi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_testpypi.yml b/.github/workflows/publish_testpypi.yml index 3aaf4874..44a6eedf 100644 --- a/.github/workflows/publish_testpypi.yml +++ b/.github/workflows/publish_testpypi.yml @@ -51,7 +51,7 @@ jobs: --logistro-level INFO --n 1 --timeout 200 - --output ${GITHUB_WORKSPACE}/integration_tests/renders/ + --output ${{ github.workspace }}/../src/py/integration_tests/renders/ - name: Test if: ${{ ! runner.debug && matrix.os != 'ubuntu-latest' }} From de884fc6a8a4740c9f3d17cd03723208ec13bd79 Mon Sep 17 00:00:00 2001 From: Andrew Pikul Date: Mon, 3 Mar 2025 15:01:53 -0500 Subject: [PATCH 5/7] Again fix directory --- .github/workflows/publish_testpypi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_testpypi.yml b/.github/workflows/publish_testpypi.yml index 44a6eedf..c1bbe721 100644 --- a/.github/workflows/publish_testpypi.yml +++ b/.github/workflows/publish_testpypi.yml @@ -51,7 +51,7 @@ jobs: --logistro-level INFO --n 1 --timeout 200 - --output ${{ github.workspace }}/../src/py/integration_tests/renders/ + --output ${{ github.workspace }}/src/py/integration_tests/renders/ - name: Test if: ${{ ! runner.debug && matrix.os != 'ubuntu-latest' }} From 26cc7b5389c2f89e2cf300ce847d85272eb803e1 Mon Sep 17 00:00:00 2001 From: Andrew Pikul Date: Mon, 3 Mar 2025 15:05:57 -0500 Subject: [PATCH 6/7] Add input to mock tests --- .github/workflows/publish_testpypi.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish_testpypi.yml b/.github/workflows/publish_testpypi.yml index c1bbe721..ee943963 100644 --- a/.github/workflows/publish_testpypi.yml +++ b/.github/workflows/publish_testpypi.yml @@ -52,6 +52,7 @@ jobs: --n 1 --timeout 200 --output ${{ github.workspace }}/src/py/integration_tests/renders/ + --input ${{ github.workspace }}/src/py/integration_tests/mocks/ - name: Test if: ${{ ! runner.debug && matrix.os != 'ubuntu-latest' }} From 2c02f0ea077b5c2f9ca4e7b9bc48a287fc5482a3 Mon Sep 17 00:00:00 2001 From: Andrew Pikul Date: Mon, 3 Mar 2025 15:08:42 -0500 Subject: [PATCH 7/7] Fix syntax for generating paths in mocker --- src/py/kaleido/_mocker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/py/kaleido/_mocker.py b/src/py/kaleido/_mocker.py index 6280e661..0b158639 100644 --- a/src/py/kaleido/_mocker.py +++ b/src/py/kaleido/_mocker.py @@ -48,7 +48,7 @@ def _load_figures_from_paths(paths: list[Path]): _logger.info(f"Yielding {path.stem}") yield { "fig": figure, - "path": args.output / f"{path.stem}.{args.format}", + "path": str(Path(args.output) / f"{path.stem}.{args.format}"), } else: raise RuntimeError(f"Path {path} is not a file.")