From bbc76a377775c5a72658f08f9bb7a727a23c897a Mon Sep 17 00:00:00 2001 From: Thorsten Beier Date: Mon, 10 Jun 2024 13:48:08 +0200 Subject: [PATCH 1/5] trigger-ci --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0f5031a..43fcdc6 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ + # empack Pack a mamba environment with emsdk From 1bee22284485e02b1d280ad5a338b06277e98e66 Mon Sep 17 00:00:00 2001 From: Thorsten Beier Date: Mon, 10 Jun 2024 13:54:49 +0200 Subject: [PATCH 2/5] Update workflow.yaml --- .github/workflows/workflow.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 1485e4d..4e05ba5 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -28,13 +28,11 @@ jobs: with: fetch-depth: 0 - - name: Install mamba and dependencies - uses: mamba-org/provision-with-micromamba@main + - uses: mamba-org/setup-micromamba@v1 with: environment-file: ci_env.yml - environment-name: ci-env - micromamba-version: '1.4.1' - + cache-environment: false + - name: Install empack shell: bash -l {0} run: | From 30b86628330958428244baf4018b4b1cc0611d8e Mon Sep 17 00:00:00 2001 From: Thorsten Beier Date: Mon, 10 Jun 2024 16:23:31 +0200 Subject: [PATCH 3/5] try with < 2 --- tests/test_integration.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/test_integration.py b/tests/test_integration.py index 9b40ba6..70e8567 100644 --- a/tests/test_integration.py +++ b/tests/test_integration.py @@ -7,8 +7,7 @@ from .conftest import CHANNELS -PYJS_VERSION = "1.0.0" -PYJS_SPEC = f"pyjs>={PYJS_VERSION}" +PYJS_SPEC = "pyjs<2" @pytest.mark.parametrize("backend_type", ["browser-main", "browser-worker"]) From 2ce1887a828944a13577ae05aa5804648c3a37f4 Mon Sep 17 00:00:00 2001 From: Thorsten Beier Date: Mon, 10 Jun 2024 16:26:09 +0200 Subject: [PATCH 4/5] ==2 --- tests/test_integration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_integration.py b/tests/test_integration.py index 70e8567..f6d5faa 100644 --- a/tests/test_integration.py +++ b/tests/test_integration.py @@ -7,7 +7,7 @@ from .conftest import CHANNELS -PYJS_SPEC = "pyjs<2" +PYJS_SPEC = "pyjs==2" @pytest.mark.parametrize("backend_type", ["browser-main", "browser-worker"]) From a38545d67f9a06a765024fbc05172ecb17c12a30 Mon Sep 17 00:00:00 2001 From: Thorsten Beier Date: Mon, 10 Jun 2024 16:29:26 +0200 Subject: [PATCH 5/5] Update test_integration.py --- tests/test_integration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_integration.py b/tests/test_integration.py index f6d5faa..93c7d32 100644 --- a/tests/test_integration.py +++ b/tests/test_integration.py @@ -7,7 +7,7 @@ from .conftest import CHANNELS -PYJS_SPEC = "pyjs==2" +PYJS_SPEC = "pyjs==2.0.0" @pytest.mark.parametrize("backend_type", ["browser-main", "browser-worker"])