chore: Update python dependencies and use the latest pip (feast-dev#3519)

achals · web-flow · commit c6190802ca2a · 2023-03-03T21:25:33.000-08:00
* chore: Update python dependencies and use the latest pip

Signed-off-by: Achal Shah &lt;achals@gmail.com&gt;

* rebase

Signed-off-by: Achal Shah &lt;achals@gmail.com&gt;

* dynamodb2 -&gt; dynamodb

Signed-off-by: Achal Shah &lt;achals@gmail.com&gt;

---------

Signed-off-by: Achal Shah &lt;achals@gmail.com&gt;
diff --git a/.github/workflows/java_master_only.yml b/.github/workflows/java_master_only.yml
@@ -119,7 +119,7 @@ jobs:
           go-version: 1.18.0
       - name: Upgrade pip version
         run: |
-          pip install --upgrade "pip>=21.3.1,<22.1"
+          pip install --upgrade pip
       - name: Get pip cache dir
         id: pip-cache
         run: |
diff --git a/.github/workflows/java_pr.yml b/.github/workflows/java_pr.yml
@@ -155,7 +155,7 @@ jobs:
           go-version: 1.18.0
       - name: Upgrade pip version
         run: |
-          pip install --upgrade "pip>=21.3.1,<22.1"
+          pip install --upgrade pip
       - name: Get pip cache dir
         id: pip-cache
         run: |
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -22,7 +22,7 @@ jobs:
           go-version: 1.18.0
       - name: Upgrade pip version
         run: |
-          pip install --upgrade "pip>=21.3.1,<22.1"
+          pip install --upgrade pip
       - name: Get pip cache dir
         id: pip-cache
         run: |
@@ -70,7 +70,7 @@ jobs:
           python-version: "3.8"
       - name: Upgrade pip version
         run: |
-          pip install --upgrade "pip>=21.3.1,<22.1"
+          pip install --upgrade pip
       - name: Install apache-arrow on ubuntu
         run: |
             sudo apt update
diff --git a/.github/workflows/master_only.yml b/.github/workflows/master_only.yml
@@ -114,7 +114,7 @@ jobs:
         run: aws sts get-caller-identity
       - name: Upgrade pip version
         run: |
-          pip install --upgrade "pip>=21.3.1,<22.1"
+          pip install --upgrade pip
       - name: Get pip cache dir
         id: pip-cache
         run: |
diff --git a/.github/workflows/nightly-ci.yml b/.github/workflows/nightly-ci.yml
@@ -164,7 +164,7 @@ jobs:
         run: aws sts get-caller-identity
       - name: Upgrade pip version
         run: |
-          pip install --upgrade "pip>=21.3.1,<22.1"
+          pip install --upgrade pip
       - 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
@@ -140,7 +140,7 @@ jobs:
         run: aws sts get-caller-identity
       - name: Upgrade pip version
         run: |
-          pip install --upgrade "pip>=21.3.1,<22.1"
+          pip install --upgrade pip
       - name: Get pip cache dir
         id: pip-cache
         run: |
diff --git a/.github/workflows/pr_local_integration_tests.yml b/.github/workflows/pr_local_integration_tests.yml
@@ -40,7 +40,7 @@ jobs:
           architecture: x64
       - name: Upgrade pip version
         run: |
-          pip install --upgrade "pip>=21.3.1,<22.1"
+          pip install --upgrade pip
       - name: Get pip cache dir
         id: pip-cache
         run: |
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -37,7 +37,7 @@ jobs:
           PATH=$PATH:/usr/local/mysql/bin
       - name: Upgrade pip version
         run: |
-          pip install --upgrade "pip>=22.1,<23"
+          pip install --upgrade pip
       - name: Get pip cache dir
         id: pip-cache
         run: |
diff --git a/sdk/python/requirements/py3.10-ci-requirements.txt b/sdk/python/requirements/py3.10-ci-requirements.txt
@@ -34,6 +34,10 @@ anyio==3.6.2
     #   watchfiles
 appdirs==1.4.4
     # via fissix
+appnope==0.1.3
+    # via
+    #   ipykernel
+    #   ipython
 argon2-cffi==21.3.0
     # via
     #   jupyter-server
@@ -456,8 +460,8 @@ makefun==1.15.1
 markupsafe==2.1.2
     # via
     #   jinja2
-    #   moto
     #   nbconvert
+    #   werkzeug
 marshmallow==3.19.0
     # via great-expectations
 matplotlib-inline==0.1.6
@@ -478,7 +482,7 @@ mock==2.0.0
     # via feast (setup.py)
 moreorless==0.4.0
     # via bowler
-moto==3.1.18
+moto==4.1.3
     # via feast (setup.py)
 msal==1.21.0
     # via
@@ -759,7 +763,6 @@ python-json-logger==2.0.7
 pytz==2022.7.1
     # via
     #   great-expectations
-    #   moto
     #   pandas
     #   snowflake-connector-python
     #   trino
@@ -1040,7 +1043,7 @@ websocket-client==1.5.1
     #   kubernetes
 websockets==10.4
     # via uvicorn
-werkzeug==2.1.2
+werkzeug==2.2.3
     # via moto
 wheel==0.38.4
     # via pip-tools
diff --git a/sdk/python/requirements/py3.8-ci-requirements.txt b/sdk/python/requirements/py3.8-ci-requirements.txt
@@ -34,6 +34,10 @@ anyio==3.6.2
     #   watchfiles
 appdirs==1.4.4
     # via fissix
+appnope==0.1.3
+    # via
+    #   ipykernel
+    #   ipython
 argon2-cffi==21.3.0
     # via
     #   jupyter-server
@@ -466,8 +470,8 @@ makefun==1.15.1
 markupsafe==2.1.2
     # via
     #   jinja2
-    #   moto
     #   nbconvert
+    #   werkzeug
 marshmallow==3.19.0
     # via great-expectations
 matplotlib-inline==0.1.6
@@ -488,7 +492,7 @@ mock==2.0.0
     # via feast (setup.py)
 moreorless==0.4.0
     # via bowler
-moto==3.1.18
+moto==4.1.3
     # via feast (setup.py)
 msal==1.21.0
     # via
@@ -772,7 +776,6 @@ pytz==2022.7.1
     # via
     #   babel
     #   great-expectations
-    #   moto
     #   pandas
     #   snowflake-connector-python
     #   trino
@@ -1058,7 +1061,7 @@ websocket-client==1.5.1
     #   kubernetes
 websockets==10.4
     # via uvicorn
-werkzeug==2.1.2
+werkzeug==2.2.3
     # via moto
 wheel==0.38.4
     # via pip-tools
diff --git a/sdk/python/requirements/py3.9-ci-requirements.txt b/sdk/python/requirements/py3.9-ci-requirements.txt
@@ -34,6 +34,10 @@ anyio==3.6.2
     #   watchfiles
 appdirs==1.4.4
     # via fissix
+appnope==0.1.3
+    # via
+    #   ipykernel
+    #   ipython
 argon2-cffi==21.3.0
     # via
     #   jupyter-server
@@ -460,8 +464,8 @@ makefun==1.15.1
 markupsafe==2.1.2
     # via
     #   jinja2
-    #   moto
     #   nbconvert
+    #   werkzeug
 marshmallow==3.19.0
     # via great-expectations
 matplotlib-inline==0.1.6
@@ -482,7 +486,7 @@ mock==2.0.0
     # via feast (setup.py)
 moreorless==0.4.0
     # via bowler
-moto==3.1.18
+moto==4.1.3
     # via feast (setup.py)
 msal==1.21.0
     # via
@@ -763,7 +767,6 @@ python-json-logger==2.0.7
 pytz==2022.7.1
     # via
     #   great-expectations
-    #   moto
     #   pandas
     #   snowflake-connector-python
     #   trino
@@ -1049,7 +1052,7 @@ websocket-client==1.5.1
     #   kubernetes
 websockets==10.4
     # via uvicorn
-werkzeug==2.1.2
+werkzeug==2.2.3
     # via moto
 wheel==0.38.4
     # via pip-tools
diff --git a/sdk/python/tests/unit/infra/online_store/test_dynamodb_online_store.py b/sdk/python/tests/unit/infra/online_store/test_dynamodb_online_store.py
@@ -3,7 +3,7 @@
 
 import boto3
 import pytest
-from moto import mock_dynamodb2
+from moto import mock_dynamodb
 
 from feast.infra.offline_stores.file import FileOfflineStoreConfig
 from feast.infra.online_stores.dynamodb import (
@@ -159,7 +159,7 @@ def test_dynamodb_table_dynamodb_resource():
     assert dynamodb_resource.meta.client.meta.endpoint_url == endpoint_url
 
 
-@mock_dynamodb2
+@mock_dynamodb
 @pytest.mark.parametrize("n_samples", [5, 50, 100])
 def test_dynamodb_online_store_online_read(
     repo_config, dynamodb_online_store, n_samples
@@ -180,7 +180,7 @@ def test_dynamodb_online_store_online_read(
     assert [item[1] for item in returned_items] == list(features)
 
 
-@mock_dynamodb2
+@mock_dynamodb
 @pytest.mark.parametrize("n_samples", [5, 50, 100])
 def test_dynamodb_online_store_online_write_batch(
     repo_config, dynamodb_online_store, n_samples
@@ -207,7 +207,7 @@ def test_dynamodb_online_store_online_write_batch(
     assert [item[1] for item in stored_items] == list(features)
 
 
-@mock_dynamodb2
+@mock_dynamodb
 def test_dynamodb_online_store_update(repo_config, dynamodb_online_store):
     """Test DynamoDBOnlineStore update method."""
     # create dummy table to keep
@@ -236,7 +236,7 @@ def test_dynamodb_online_store_update(repo_config, dynamodb_online_store):
     assert existing_tables[0] == f"test_aws.{db_table_keep_name}"
 
 
-@mock_dynamodb2
+@mock_dynamodb
 def test_dynamodb_online_store_teardown(repo_config, dynamodb_online_store):
     """Test DynamoDBOnlineStore teardown method."""
     db_table_delete_name_one = f"{TABLE_NAME}_delete_teardown_1"
@@ -262,7 +262,7 @@ def test_dynamodb_online_store_teardown(repo_config, dynamodb_online_store):
     assert len(existing_tables) == 0
 
 
-@mock_dynamodb2
+@mock_dynamodb
 def test_dynamodb_online_store_online_read_unknown_entity(
     repo_config, dynamodb_online_store
 ):
@@ -301,7 +301,7 @@ def test_dynamodb_online_store_online_read_unknown_entity(
         assert returned_items[pos] == (None, None)
 
 
-@mock_dynamodb2
+@mock_dynamodb
 def test_write_batch_non_duplicates(repo_config, dynamodb_online_store):
     """Test DynamoDBOnline Store deduplicate write batch request items."""
     dynamodb_tbl = f"{TABLE_NAME}_batch_non_duplicates"
@@ -321,7 +321,7 @@ def test_write_batch_non_duplicates(repo_config, dynamodb_online_store):
     assert len(returned_items) == len(data)
 
 
-@mock_dynamodb2
+@mock_dynamodb
 def test_dynamodb_online_store_online_read_unknown_entity_end_of_batch(
     repo_config, dynamodb_online_store
 ):
diff --git a/setup.py b/setup.py
@@ -156,7 +156,7 @@
         "grpcio-testing>=1.47.0",
         "minio==7.1.0",
         "mock==2.0.0",
-        "moto<4",
+        "moto",
         "mypy>=0.981,<0.990",
         "mypy-protobuf==3.1",
         "avro==1.10.0",
