From bd97c7489de1e8c81282a59ddd21f328051d525d Mon Sep 17 00:00:00 2001 From: "Thomas J. Fan" Date: Thu, 16 Nov 2023 16:52:25 -0500 Subject: [PATCH 1/3] MAINT Remove sorted-containers, deprecated, and urllib3 dependency Signed-off-by: Thomas J. Fan --- dev-requirements.txt | 5 ----- doc-requirements.txt | 5 ----- setup.py | 3 --- .../remote/mock_flyte_repo/workflows/requirements.txt | 5 ----- 4 files changed, 18 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 0d71b1b216..7c2153ea0e 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -104,8 +104,6 @@ decorator==5.1.1 # via # gcsfs # ipython -deprecated==1.2.14 - # via flytekit diskcache==5.6.3 # via flytekit distlib==0.3.7 @@ -485,7 +483,6 @@ smmap==5.0.1 # via gitdb sortedcontainers==2.4.0 # via - # flytekit # hypothesis stack-data==0.6.3 # via ipython @@ -550,7 +547,6 @@ urllib3==1.26.18 # via # botocore # docker - # flytekit # kubernetes # requests virtualenv==20.24.6 @@ -571,7 +567,6 @@ wheel==0.41.3 wrapt==1.15.0 # via # aiobotocore - # deprecated # flytekit # tensorflow yarl==1.9.2 diff --git a/doc-requirements.txt b/doc-requirements.txt index f672814791..a2570d5dd9 100644 --- a/doc-requirements.txt +++ b/doc-requirements.txt @@ -215,8 +215,6 @@ decorator==5.1.1 # retry defusedxml==0.7.1 # via nbconvert -deprecated==1.2.14 - # via flytekit dill==0.3.7 # via # datasets @@ -1146,7 +1144,6 @@ snowflake-connector-python==3.2.0 sortedcontainers==2.4.0 # via # distributed - # flytekit # snowflake-connector-python soupsieve==2.5 # via beautifulsoup4 @@ -1366,7 +1363,6 @@ urllib3==1.26.16 # databricks-cli # distributed # docker - # flytekit # google-auth # great-expectations # kubernetes @@ -1448,7 +1444,6 @@ wrapt==1.15.0 # via # aiobotocore # astroid - # deprecated # flytekit # pandera # tensorflow diff --git a/setup.py b/setup.py index 79c05a8475..145befa524 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,6 @@ "cookiecutter>=1.7.3", "croniter>=0.3.20,<4.0.0", "dataclasses-json>=0.5.2,<0.5.12", # TODO: remove upper-bound after fixing change in contract - "deprecated>=1.0,<2.0", "diskcache>=5.2.1", "docker-image-py>=0.1.10", "docker>=4.0.0,<7.0.0", @@ -72,10 +71,8 @@ "rich", "rich_click", "s3fs>=0.6.0", - "sortedcontainers>=1.5.9,<3.0.0", "statsd>=3.0.0,<4.0.0", "typing_extensions", - "urllib3>=1.22,<2.0.0", "wheel>=0.30.0,<1.0.0", "wrapt>=1.0.0,<2.0.0", ], 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 6334d54586..480ff9a337 100644 --- a/tests/flytekit/integration/remote/mock_flyte_repo/workflows/requirements.txt +++ b/tests/flytekit/integration/remote/mock_flyte_repo/workflows/requirements.txt @@ -82,8 +82,6 @@ dataclasses-json==0.5.9 # via flytekit decorator==5.1.1 # via gcsfs -deprecated==1.2.14 - # via flytekit diskcache==5.6.1 # via flytekit docker==6.1.3 @@ -332,8 +330,6 @@ six==1.16.0 # python-dateutil smmap==5.0.0 # via gitdb -sortedcontainers==2.4.0 - # via flytekit statsd==3.3.0 # via flytekit text-unidecode==1.3 @@ -352,7 +348,6 @@ urllib3==1.26.18 # via # botocore # docker - # flytekit # google-auth # kubernetes # requests From 916db7a8b443bc554ead8dd129716a31d542fbcf Mon Sep 17 00:00:00 2001 From: "Thomas J. Fan" Date: Sun, 19 Nov 2023 21:09:33 -0500 Subject: [PATCH 2/3] Add urllib to see if it fixes the dependency resolution Signed-off-by: Thomas J. Fan --- dev-requirements.txt | 1 + doc-requirements.txt | 1 + setup.py | 1 + .../remote/mock_flyte_repo/workflows/requirements.txt | 1 + 4 files changed, 4 insertions(+) diff --git a/dev-requirements.txt b/dev-requirements.txt index feb8c0378a..d26b9d84c6 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -540,6 +540,7 @@ urllib3==1.26.18 # via # botocore # docker + # flytekit # kubernetes # requests virtualenv==20.24.6 diff --git a/doc-requirements.txt b/doc-requirements.txt index 7f94b7d9bf..f66b069212 100644 --- a/doc-requirements.txt +++ b/doc-requirements.txt @@ -1357,6 +1357,7 @@ urllib3==1.26.16 # databricks-cli # distributed # docker + # flytekit # google-auth # great-expectations # kubernetes diff --git a/setup.py b/setup.py index f12282b256..2e9c0b6c5f 100644 --- a/setup.py +++ b/setup.py @@ -69,6 +69,7 @@ "s3fs>=0.6.0", "statsd>=3.0.0,<4.0.0", "typing_extensions", + "urllib3>=1.22,<2.0.0", "wheel>=0.30.0,<1.0.0", "wrapt>=1.0.0,<2.0.0", ], 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 1e88736dca..75b0efde08 100644 --- a/tests/flytekit/integration/remote/mock_flyte_repo/workflows/requirements.txt +++ b/tests/flytekit/integration/remote/mock_flyte_repo/workflows/requirements.txt @@ -336,6 +336,7 @@ urllib3==1.26.18 # via # botocore # docker + # flytekit # google-auth # kubernetes # requests From 8a3ce81913f48c9fa3f71fe25e08938aa737219e Mon Sep 17 00:00:00 2001 From: "Thomas J. Fan" Date: Sun, 19 Nov 2023 21:41:31 -0500 Subject: [PATCH 3/3] Remove dateutil Signed-off-by: Thomas J. Fan --- dev-requirements.txt | 1 - doc-requirements.txt | 1 - setup.py | 1 - .../remote/mock_flyte_repo/workflows/requirements.txt | 1 - 4 files changed, 4 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index d26b9d84c6..320397d69b 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -407,7 +407,6 @@ python-dateutil==2.8.2 # arrow # botocore # croniter - # flytekit # google-cloud-bigquery # kubernetes # pandas diff --git a/doc-requirements.txt b/doc-requirements.txt index f66b069212..aa640b5c7e 100644 --- a/doc-requirements.txt +++ b/doc-requirements.txt @@ -950,7 +950,6 @@ python-dateutil==2.8.2 # arrow # botocore # croniter - # flytekit # google-cloud-bigquery # great-expectations # jupyter-client diff --git a/setup.py b/setup.py index 2e9c0b6c5f..1bab6454ce 100644 --- a/setup.py +++ b/setup.py @@ -59,7 +59,6 @@ # TODO: Remove upper-bound after protobuf community fixes it. https://github.com/flyteorg/flyte/issues/4359 "protobuf<4.25.0", "pyarrow>=4.0.0,<11.0.0", - "python-dateutil>=2.1", "python-json-logger>=2.0.0", "pytimeparse>=1.1.8,<2.0.0", "pyyaml!=6.0.0,!=5.4.0,!=5.4.1", # pyyaml is broken with cython 3: https://github.com/yaml/pyyaml/issues/601 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 75b0efde08..fd51abd379 100644 --- a/tests/flytekit/integration/remote/mock_flyte_repo/workflows/requirements.txt +++ b/tests/flytekit/integration/remote/mock_flyte_repo/workflows/requirements.txt @@ -257,7 +257,6 @@ python-dateutil==2.8.2 # arrow # botocore # croniter - # flytekit # kubernetes # matplotlib # pandas