Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pluck retry from flytekit and into sagemaker #1411

Merged
merged 11 commits into from
Mar 14, 2023
Merged

Pluck retry from flytekit and into sagemaker #1411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1e77611
Remove retry from flytekit's setup.py and regenerate requirements
eapolinario Jan 12, 2023
0a2cfb6
Add to sagemaker
eapolinario Jan 12, 2023
4349a39
Merge branch 'master' into pluck-retry-from-flytekit-and-into-sagemaker
eapolinario Jan 17, 2023
0fd30a9
Merge branch 'master' into pluck-retry-from-flytekit-and-into-sagemaker
eapolinario Jan 19, 2023
76edd6a
Merge branch 'master' into pluck-retry-from-flytekit-and-into-sagemaker
eapolinario Jan 19, 2023
4732a30
Remove retry from sagemaker plugin requirements file
eapolinario Jan 24, 2023
46b7cb0
Merge remote-tracking branch 'origin' into pluck-retry-from-flytekit-…
eapolinario Jan 24, 2023
ec5669c
Merge branch 'master' into pluck-retry-from-flytekit-and-into-sagemaker
eapolinario Jan 27, 2023
c501afd
Merge remote-tracking branch 'origin' into pluck-retry-from-flytekit-…
eapolinario Mar 13, 2023
1a84ff9
Restore doc-requirements.txt
eapolinario Mar 13, 2023
1e4cfe8
Fix bad merge
eapolinario Mar 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions plugins/flytekit-aws-sagemaker/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ cryptography==38.0.4
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
Expand Down Expand Up @@ -147,8 +148,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
Expand Down Expand Up @@ -188,8 +187,8 @@ requests==2.28.1
# 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
Expand Down
2 changes: 1 addition & 1 deletion plugins/flytekit-aws-sagemaker/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

microlib_name = f"flytekitplugins-{PLUGIN_NAME}"

plugin_requires = ["flytekit>=1.3.0b2,<2.0.0", "sagemaker-training>=3.6.2,<4.0.0"]
plugin_requires = ["flytekit>=1.3.0b2,<2.0.0", "sagemaker-training>=3.6.2,<4.0.0", "retry2==0.9.5"]

__version__ = "0.0.0+develop"

Expand Down
18 changes: 11 additions & 7 deletions plugins/flytekit-duckdb/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,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
Expand All @@ -32,8 +32,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
Expand Down Expand Up @@ -67,8 +65,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
Expand Down Expand Up @@ -118,8 +120,6 @@ protobuf==4.21.12
# protoc-gen-swagger
protoc-gen-swagger==0.1.0
# via flyteidl
py==1.11.0
# via retry
pyarrow==10.0.1
# via flytekit
pycparser==2.21
Expand Down Expand Up @@ -148,7 +148,7 @@ pyyaml==6.0
# flytekit
regex==2022.10.31
# via docker-image-py
requests==2.28.1
requests==2.28.2
# via
# cookiecutter
# docker
Expand All @@ -172,11 +172,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
Expand Down
1 change: 0 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down