From 1a22526cee46462f032e5e49e141f38af04cf20d Mon Sep 17 00:00:00 2001 From: Andrei Vishniakov <31008759+avishniakov@users.noreply.github.com> Date: Tue, 10 Oct 2023 18:09:31 +0200 Subject: [PATCH 1/4] reduce integrations to local --- .github/workflows/ci.yml | 2 +- template/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3dbe72b..abb636c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,4 +35,4 @@ jobs: with: stack-name: ${{ matrix.stack-name }} python-version: ${{ matrix.python-version }} - ref-zenml: feature/OSS-2300-model-watch-tower-v0.1 + ref-zenml: develop diff --git a/template/Makefile b/template/Makefile index 3f0ab4a..a5672fe 100644 --- a/template/Makefile +++ b/template/Makefile @@ -9,7 +9,7 @@ setup: remote-login setup: {%- endif %} pip install -r requirements.txt - zenml integration install sklearn mlflow s3 kubernetes kubeflow slack evidently -y + zenml integration install sklearn mlflow slack evidently -y install-stack: @echo "Specify stack name [$(stack_name)]: " && read input && [ -n "$$input" ] && stack_name="$$input" || stack_name="$(stack_name)" && \ From 87e3d7fca518b00f074fe8263253fb6ed2785305 Mon Sep 17 00:00:00 2001 From: Andrei Vishniakov <31008759+avishniakov@users.noreply.github.com> Date: Wed, 11 Oct 2023 14:56:20 +0200 Subject: [PATCH 2/4] rework test action --- .github/actions/e2e_template_test/action.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/e2e_template_test/action.yml b/.github/actions/e2e_template_test/action.yml index 6780cb6..e024607 100644 --- a/.github/actions/e2e_template_test/action.yml +++ b/.github/actions/e2e_template_test/action.yml @@ -58,19 +58,19 @@ runs: if: ${{ inputs.ref-zenml != '' }} shell: bash run: | - pip install "git+https://github.com/zenml-io/zenml.git@${{ inputs.ref-zenml }}" "zenml[server]@git+https://github.com/zenml-io/zenml.git@${{ inputs.ref-zenml }}" + pip install "zenml[dev, server, template]@git+https://github.com/zenml-io/zenml.git@${{ inputs.ref-zenml }}" - name: Install ZenML if: ${{ inputs.ref-zenml == '' }} shell: bash run: | - pip install zenml "zenml[server]" + pip install zenml "zenml[dev, server, template]" - name: Concatenate requirements shell: bash run: | - zenml integration export-requirements -o ./local_checkout/integration-requirements.txt sklearn mlflow s3 kubernetes kubeflow slack evidently - cat ./local_checkout/requirements.txt ./local_checkout/test-requirements.txt ./local_checkout/integration-requirements.txt >> ./local_checkout/all-requirements.txt + zenml integration export-requirements -o ./local_checkout/integration-requirements.txt sklearn mlflow s3 slack evidently + cat ./local_checkout/test-requirements.txt ./local_checkout/integration-requirements.txt >> ./local_checkout/all-requirements.txt - name: Install requirements shell: bash From 73c6e8db534bedcbea3f36edc00cf20313d5fc77 Mon Sep 17 00:00:00 2001 From: Andrei Vishniakov <31008759+avishniakov@users.noreply.github.com> Date: Wed, 11 Oct 2023 17:39:05 +0200 Subject: [PATCH 3/4] clean-up after run --- .github/actions/e2e_template_test/action.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/actions/e2e_template_test/action.yml b/.github/actions/e2e_template_test/action.yml index e024607..2107c0a 100644 --- a/.github/actions/e2e_template_test/action.yml +++ b/.github/actions/e2e_template_test/action.yml @@ -83,3 +83,8 @@ runs: ZENML_STACK_NAME: ${{ inputs.stack-name }} run: | pytest ./local_checkout/tests + + - name: Clean-up + shell: bash + run: | + rm -rf ./local_checkout From f4c0e4ea87d22a9aba5d64e74504fbfacd31b1e2 Mon Sep 17 00:00:00 2001 From: Andrei Vishniakov <31008759+avishniakov@users.noreply.github.com> Date: Wed, 11 Oct 2023 17:41:49 +0200 Subject: [PATCH 4/4] fix extra typo --- .github/actions/e2e_template_test/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/e2e_template_test/action.yml b/.github/actions/e2e_template_test/action.yml index 2107c0a..9802e08 100644 --- a/.github/actions/e2e_template_test/action.yml +++ b/.github/actions/e2e_template_test/action.yml @@ -58,13 +58,13 @@ runs: if: ${{ inputs.ref-zenml != '' }} shell: bash run: | - pip install "zenml[dev, server, template]@git+https://github.com/zenml-io/zenml.git@${{ inputs.ref-zenml }}" + pip install "zenml[dev, server, templates]@git+https://github.com/zenml-io/zenml.git@${{ inputs.ref-zenml }}" - name: Install ZenML if: ${{ inputs.ref-zenml == '' }} shell: bash run: | - pip install zenml "zenml[dev, server, template]" + pip install "zenml[dev, server, templates]" - name: Concatenate requirements shell: bash