Pluck retry from flytekit and into sagemaker (#1411)

* Remove retry from flytekit's setup.py and regenerate requirements Signed-off-by: Eduardo Apolinario <[email protected]> * Add to sagemaker Signed-off-by: Eduardo Apolinario <[email protected]> * Remove retry from sagemaker plugin requirements file Signed-off-by: Eduardo Apolinario <[email protected]> * Restore doc-requirements.txt Signed-off-by: eduardo apolinario <[email protected]> * Fix bad merge Signed-off-by: eduardo apolinario <[email protected]> --------- Signed-off-by: Eduardo Apolinario <[email protected]> Signed-off-by: eduardo apolinario <[email protected]> Co-authored-by: Eduardo Apolinario <[email protected]>
flyteorg · May 16, 2023 · f6331ca · f6331ca
1 parent 4555578
commit f6331ca
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/plugins/flytekit-aws-sagemaker/requirements.txt b/plugins/flytekit-aws-sagemaker/requirements.txt
@@ -46,7 +46,8 @@ cryptography==39.0.1
 dataclasses-json==0.5.7
     # via flytekit
 decorator==5.1.1
-    # via retry
+    # via
+    #   retry2
 deprecated==1.2.13
     # via flytekit
 diskcache==5.4.0
@@ -152,8 +153,6 @@ protoc-gen-swagger==0.1.0
     # via flyteidl
 psutil==5.9.4
     # via sagemaker-training
-py==1.11.0
-    # via retry
 pyarrow==10.0.1
     # via flytekit
 pycparser==2.21
@@ -193,8 +192,8 @@ requests==2.28.2
     #   responses
 responses==0.22.0
     # via flytekit
-retry==0.9.2
-    # via flytekit
+retry2==0.9.5
+    # via flytekitplugins-awssagemaker
 retrying==1.3.4
     # via sagemaker-training
 s3transfer==0.6.0

diff --git a/plugins/flytekit-aws-sagemaker/setup.py b/plugins/flytekit-aws-sagemaker/setup.py
@@ -4,7 +4,7 @@
 
 microlib_name = f"flytekitplugins-{PLUGIN_NAME}"
 
-plugin_requires = ["flytekit>=1.1.0b0,<1.3.0,<2.0.0", "sagemaker-training>=3.6.2,<4.0.0"]
+plugin_requires = ["flytekit>=1.1.0b0,<1.3.0,<2.0.0", "sagemaker-training>=3.6.2,<4.0.0", "retry2==0.9.5"]
 
 __version__ = "0.0.0+develop"
 

diff --git a/plugins/flytekit-duckdb/requirements.txt b/plugins/flytekit-duckdb/requirements.txt
@@ -20,7 +20,7 @@ cffi==1.15.1
     # via cryptography
 chardet==5.1.0
     # via binaryornot
-charset-normalizer==2.1.1
+charset-normalizer==3.0.1
     # via requests
 click==8.1.3
     # via
@@ -36,8 +36,6 @@ cryptography==39.0.0
     # via pyopenssl
 dataclasses-json==0.5.7
     # via flytekit
-decorator==5.1.1
-    # via retry
 deprecated==1.2.13
     # via flytekit
 diskcache==5.4.0
@@ -76,8 +74,12 @@ idna==3.4
     # via requests
 importlib-metadata==6.0.0
     # via
+    #   click
     #   flytekit
+    #   jsonschema
     #   keyring
+importlib-resources==5.10.2
+    # via keyring
 jaraco-classes==3.2.3
     # via keyring
 jinja2==3.1.2
@@ -132,8 +134,6 @@ protobuf==3.20.3
     #   protoc-gen-swagger
 protoc-gen-swagger==0.1.0
     # via flyteidl
-py==1.11.0
-    # via retry
 pyarrow==10.0.1
     # via flytekit
 pyasn1==0.4.8
@@ -170,7 +170,7 @@ pyyaml==6.0
     #   kubernetes
 regex==2022.10.31
     # via docker-image-py
-requests==2.28.1
+requests==2.28.2
     # via
     #   cookiecutter
     #   docker
@@ -206,11 +206,15 @@ types-toml==0.10.8.1
     # via responses
 typing-extensions==4.4.0
     # via
+    #   arrow
     #   flytekit
+    #   gitpython
+    #   importlib-metadata
+    #   responses
     #   typing-inspect
 typing-inspect==0.8.0
     # via dataclasses-json
-urllib3==1.26.13
+urllib3==1.26.14
     # via
     #   docker
     #   flytekit

diff --git a/setup.py b/setup.py
@@ -60,7 +60,6 @@
         "statsd>=3.0.0,<4.0.0",
         "urllib3>=1.22,<2.0.0",
         "wrapt>=1.0.0,<2.0.0",
-        "retry==0.9.2",
         "dataclasses-json>=0.5.2",
         "marshmallow-jsonschema>=0.12.0",
         "natsort>=7.0.1",