From a909ee02ca6314041ec8aef5b7797dc11c47b9c1 Mon Sep 17 00:00:00 2001 From: Felix Wang Date: Fri, 22 Oct 2021 10:37:13 -0700 Subject: [PATCH 1/3] Test potential fix for linter Signed-off-by: Felix Wang --- sdk/python/feast/infra/gcp.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/python/feast/infra/gcp.py b/sdk/python/feast/infra/gcp.py index 1dd1eefe2d..463a39af5a 100644 --- a/sdk/python/feast/infra/gcp.py +++ b/sdk/python/feast/infra/gcp.py @@ -22,7 +22,7 @@ class GCSRegistryStore(RegistryStore): def __init__(self, registry_config: RegistryConfig, repo_path: Path): uri = registry_config.path try: - from google.cloud import storage + import google.cloud.storage as storage except ImportError as e: from feast.errors import FeastExtrasDependencyImportError @@ -34,7 +34,7 @@ def __init__(self, registry_config: RegistryConfig, repo_path: Path): self._blob = self._uri.path.lstrip("/") def get_registry_proto(self): - from google.cloud import storage + import google.cloud.storage as storage from google.cloud.exceptions import NotFound file_obj = TemporaryFile() From 36a45ca7c17bf060534b45f5a5b574587e110f89 Mon Sep 17 00:00:00 2001 From: Felix Wang Date: Fri, 22 Oct 2021 10:47:51 -0700 Subject: [PATCH 2/3] Downgrade pip to <21.3 to ensure integration tests pass Signed-off-by: Felix Wang --- .github/workflows/integration_tests.yml | 3 +++ .github/workflows/linter.yml | 3 +++ .github/workflows/pr_integration_tests.yml | 3 +++ .github/workflows/unit_tests.yml | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 19bc08e518..c25d0c5836 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -50,6 +50,9 @@ jobs: aws-region: us-west-2 - name: Use AWS CLI run: aws sts get-caller-identity + - name: Downgrade pip + run: | + pip install --upgrade "pip<21.3" - name: Get pip cache dir id: pip-cache run: | diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index aa39225be6..b63f52da39 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -13,6 +13,9 @@ jobs: with: python-version: "3.7" architecture: x64 + - name: Downgrade pip + run: | + pip install --upgrade "pip<21.3" - name: Get pip cache dir id: pip-cache run: | diff --git a/.github/workflows/pr_integration_tests.yml b/.github/workflows/pr_integration_tests.yml index 16e23d31bb..3aeb91112b 100644 --- a/.github/workflows/pr_integration_tests.yml +++ b/.github/workflows/pr_integration_tests.yml @@ -61,6 +61,9 @@ jobs: aws-region: us-west-2 - name: Use AWS CLI run: aws sts get-caller-identity + - name: Downgrade pip + run: | + pip install --upgrade "pip<21.3" - name: Get pip cache dir id: pip-cache run: | diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 5eeb4b27ea..ae1bb9dfe8 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -20,7 +20,7 @@ jobs: with: python-version: ${{ matrix.python-version }} architecture: x64 - - name: Downgrade pip + - name: Downgrade pip run: | pip install --upgrade "pip<21.3" - name: Get pip cache dir From 36a970361d126253bf21cc02f1e3b169f850d552 Mon Sep 17 00:00:00 2001 From: Felix Wang Date: Fri, 22 Oct 2021 10:58:51 -0700 Subject: [PATCH 3/3] Upgrade pip version to >=21.3.1 to fix issues with pip==21.3.0 Signed-off-by: Felix Wang --- .github/workflows/integration_tests.yml | 4 ++-- .github/workflows/linter.yml | 4 ++-- .github/workflows/pr_integration_tests.yml | 4 ++-- .github/workflows/unit_tests.yml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index c25d0c5836..64a32bbed7 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -50,9 +50,9 @@ jobs: aws-region: us-west-2 - name: Use AWS CLI run: aws sts get-caller-identity - - name: Downgrade pip + - name: Upgrade pip version run: | - pip install --upgrade "pip<21.3" + pip install --upgrade "pip>=21.3.1" - name: Get pip cache dir id: pip-cache run: | diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index b63f52da39..e2763bf2ae 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -13,9 +13,9 @@ jobs: with: python-version: "3.7" architecture: x64 - - name: Downgrade pip + - name: Upgrade pip version run: | - pip install --upgrade "pip<21.3" + pip install --upgrade "pip>=21.3.1" - name: Get pip cache dir id: pip-cache run: | diff --git a/.github/workflows/pr_integration_tests.yml b/.github/workflows/pr_integration_tests.yml index 3aeb91112b..816be27cbf 100644 --- a/.github/workflows/pr_integration_tests.yml +++ b/.github/workflows/pr_integration_tests.yml @@ -61,9 +61,9 @@ jobs: aws-region: us-west-2 - name: Use AWS CLI run: aws sts get-caller-identity - - name: Downgrade pip + - name: Upgrade pip version run: | - pip install --upgrade "pip<21.3" + pip install --upgrade "pip>=21.3.1" - name: Get pip cache dir id: pip-cache run: | diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index ae1bb9dfe8..dd01a63a5e 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -20,9 +20,9 @@ jobs: with: python-version: ${{ matrix.python-version }} architecture: x64 - - name: Downgrade pip + - name: Upgrade pip version run: | - pip install --upgrade "pip<21.3" + pip install --upgrade "pip>=21.3.1" - name: Get pip cache dir id: pip-cache run: |