From ec32f6ed492dea0f4edc739393ea6333da99eb99 Mon Sep 17 00:00:00 2001 From: Yee Hing Tong Date: Tue, 7 Sep 2021 10:26:40 -0700 Subject: [PATCH 1/5] hopefully fix integration tests Signed-off-by: Yee Hing Tong --- cc | 3 +++ .../remote/mock_flyte_repo/workflows/requirements.txt | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 cc diff --git a/cc b/cc new file mode 100644 index 0000000000..5d39c1e366 --- /dev/null +++ b/cc @@ -0,0 +1,3 @@ +import os + +class A(): diff --git a/tests/flytekit/integration/remote/mock_flyte_repo/workflows/requirements.txt b/tests/flytekit/integration/remote/mock_flyte_repo/workflows/requirements.txt index e6a22517e5..c18f52c51a 100644 --- a/tests/flytekit/integration/remote/mock_flyte_repo/workflows/requirements.txt +++ b/tests/flytekit/integration/remote/mock_flyte_repo/workflows/requirements.txt @@ -20,7 +20,7 @@ dataclasses-json==0.5.5 # via flytekit decorator==5.0.9 # via retry -deprecated==1.2.12 +deprecated==1.2.13 # via flytekit dirhash==0.2.1 # via flytekit @@ -30,9 +30,9 @@ docker-image-py==0.1.12 # via flytekit docstring-parser==0.10 # via flytekit -flyteidl==0.20.1 +flyteidl==0.20.2 # via flytekit -flytekit==0.22.0b6 +flytekit==0.22.1 # via -r requirements.in grpcio==1.39.0 # via flytekit @@ -71,7 +71,7 @@ pandas==1.3.2 # via flytekit pathspec==0.9.0 # via scantree -pillow==8.3.1 +pillow==8.3.2 # via matplotlib protobuf==3.17.3 # via From cd1215c9b10ca43cd21125c342a89071a327e296 Mon Sep 17 00:00:00 2001 From: Yee Hing Tong Date: Tue, 7 Sep 2021 10:27:49 -0700 Subject: [PATCH 2/5] nit Signed-off-by: Yee Hing Tong --- cc | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 cc diff --git a/cc b/cc deleted file mode 100644 index 5d39c1e366..0000000000 --- a/cc +++ /dev/null @@ -1,3 +0,0 @@ -import os - -class A(): From 578b4be6827385ff56356b6bdc7ffd780d9bfde4 Mon Sep 17 00:00:00 2001 From: Yee Hing Tong Date: Tue, 7 Sep 2021 11:41:20 -0700 Subject: [PATCH 3/5] add verbose Signed-off-by: Yee Hing Tong --- plugins/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Makefile b/plugins/Makefile index a0b35df16e..28e1ff6bd7 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -4,7 +4,7 @@ test: .PHONY: install-all-dev install-all-dev: - pip install -e . + pip install -e -v . .PHONY: build_all_plugins build_all_plugins: From 8b806dce332efd7f1286608d5f4ec9b769efac75 Mon Sep 17 00:00:00 2001 From: Yee Hing Tong Date: Tue, 7 Sep 2021 12:38:24 -0700 Subject: [PATCH 4/5] add verbose Signed-off-by: Yee Hing Tong --- plugins/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Makefile b/plugins/Makefile index 28e1ff6bd7..f545b50b88 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -4,7 +4,7 @@ test: .PHONY: install-all-dev install-all-dev: - pip install -e -v . + pip -v install -e . .PHONY: build_all_plugins build_all_plugins: From 011f07d8e546e170c69759e029cac658ab7c5e96 Mon Sep 17 00:00:00 2001 From: Yee Hing Tong Date: Tue, 7 Sep 2021 13:51:56 -0700 Subject: [PATCH 5/5] pin versions of wheel, pip, etc Signed-off-by: Yee Hing Tong --- .github/workflows/pythonbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonbuild.yml b/.github/workflows/pythonbuild.yml index 7be1f0a741..f1c8551ffc 100644 --- a/.github/workflows/pythonbuild.yml +++ b/.github/workflows/pythonbuild.yml @@ -32,7 +32,7 @@ jobs: key: ${{ format('{0}-pip-{1}', runner.os, hashFiles('dev-requirements.txt', format('requirements{0}.txt', matrix.spark-version-suffix))) }} - name: Install dependencies run: | - python -m pip install --upgrade pip setuptools wheel + python -m pip install pip==21.2.4 setuptools==57.4.0 wheel==0.37.0 make setup${{ matrix.spark-version-suffix }} make -C plugins install-all-dev pip freeze