From ab0489112624d85a1341073eb722fa328e008745 Mon Sep 17 00:00:00 2001 From: Eduardo Apolinario <653394+eapolinario@users.noreply.github.com> Date: Mon, 20 Dec 2021 12:41:55 -0800 Subject: [PATCH] Remove pytz constraint (#786) * Remove pytz constraint from setup.py Signed-off-by: Eduardo Apolinario * Regenerate requirements files Signed-off-by: Eduardo Apolinario * Put pytz back Signed-off-by: Eduardo Apolinario * make requirements.txt Signed-off-by: Eduardo Apolinario Co-authored-by: Eduardo Apolinario --- dev-requirements.txt | 29 ++++++----- doc-requirements.txt | 49 +++++++++---------- requirements-spark2.txt | 44 ++++++++--------- requirements.txt | 40 +++++++-------- setup.py | 2 +- .../workflows/requirements.txt | 35 +++++-------- 6 files changed, 90 insertions(+), 109 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 4ba14b6a8c..cfea1f15a8 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -44,7 +44,7 @@ chardet==4.0.0 # via # -c requirements.txt # binaryornot -charset-normalizer==2.0.8 +charset-normalizer==2.0.9 # via # -c requirements.txt # requests @@ -69,11 +69,11 @@ cookiecutter==1.7.3 # flytekit coverage[toml]==6.2 # via -r dev-requirements.in -croniter==1.0.15 +croniter==1.1.0 # via # -c requirements.txt # flytekit -cryptography==36.0.0 +cryptography==36.0.1 # via # -c requirements.txt # paramiko @@ -94,7 +94,7 @@ diskcache==5.3.0 # via # -c requirements.txt # flytekit -distlib==0.3.3 +distlib==0.3.4 # via virtualenv distro==1.6.0 # via docker-compose @@ -118,11 +118,11 @@ docstring-parser==0.13 # flytekit filelock==3.4.0 # via virtualenv -flyteidl==0.21.11 +flyteidl==0.21.13 # via # -c requirements.txt # flytekit -grpcio==1.42.0 +grpcio==1.43.0 # via # -c requirements.txt # flytekit @@ -132,7 +132,7 @@ idna==3.3 # via # -c requirements.txt # requests -importlib-metadata==4.8.2 +importlib-metadata==4.10.0 # via # -c requirements.txt # keyring @@ -183,20 +183,20 @@ marshmallow-jsonschema==0.13.0 # flytekit mock==4.0.3 # via -r dev-requirements.in -mypy==0.910 +mypy==0.920 # via -r dev-requirements.in mypy-extensions==0.4.3 # via # -c requirements.txt # mypy # typing-inspect -natsort==8.0.0 +natsort==8.0.2 # via # -c requirements.txt # flytekit nodeenv==1.6.0 # via pre-commit -numpy==1.21.4 +numpy==1.21.5 # via # -c requirements.txt # pandas @@ -205,7 +205,7 @@ packaging==21.3 # via # -c requirements.txt # pytest -pandas==1.3.4 +pandas==1.3.5 # via # -c requirements.txt # flytekit @@ -285,10 +285,9 @@ pytimeparse==1.1.8 # via # -c requirements.txt # flytekit -pytz==2018.4 +pytz==2021.3 # via # -c requirements.txt - # flytekit # pandas pyyaml==5.4.1 # via @@ -349,13 +348,13 @@ texttable==1.6.4 # via docker-compose toml==0.10.2 # via - # mypy # pre-commit # pytest -tomli==1.2.2 +tomli==1.2.3 # via # -c requirements.txt # coverage + # mypy typing-extensions==4.0.1 # via # -c requirements.txt diff --git a/doc-requirements.txt b/doc-requirements.txt index 1913e64cf2..df16bb0ff4 100644 --- a/doc-requirements.txt +++ b/doc-requirements.txt @@ -29,13 +29,13 @@ beautifulsoup4==4.10.0 # sphinx-material binaryornot==0.4.4 # via cookiecutter -black==21.11b1 +black==21.12b0 # via papermill bleach==4.1.0 # via nbconvert -boto3==1.20.17 +boto3==1.20.24 # via sagemaker-training -botocore==1.23.17 +botocore==1.23.24 # via # boto3 # s3transfer @@ -48,7 +48,7 @@ cffi==1.15.0 # pynacl chardet==4.0.0 # via binaryornot -charset-normalizer==2.0.8 +charset-normalizer==2.0.9 # via requests checksumdir==1.2.0 # via flytekit @@ -63,9 +63,9 @@ cloudpickle==2.0.0 # via flytekit cookiecutter==1.7.3 # via flytekit -croniter==1.0.15 +croniter==1.1.0 # via flytekit -cryptography==36.0.0 +cryptography==36.0.1 # via # -r doc-requirements.in # paramiko @@ -95,15 +95,15 @@ entrypoints==0.3 # jupyter-client # nbconvert # papermill -flyteidl==0.21.11 +flyteidl==0.21.13 # via flytekit furo @ git+git://github.com/flyteorg/furo@main # via -r doc-requirements.in -gevent==21.8.0 +gevent==21.12.0 # via sagemaker-training greenlet==1.1.2 # via gevent -grpcio==1.42.0 +grpcio==1.43.0 # via # -r doc-requirements.in # flytekit @@ -113,13 +113,13 @@ idna==3.3 # via requests imagesize==1.3.0 # via sphinx -importlib-metadata==4.8.2 +importlib-metadata==4.10.0 # via keyring inotify_simple==1.2.1 # via sagemaker-training ipykernel==5.5.6 # via flytekit -ipython==7.30.0 +ipython==7.30.1 # via ipykernel ipython-genutils==0.2.0 # via @@ -144,7 +144,7 @@ jmespath==0.10.0 # via # boto3 # botocore -jsonschema==4.2.1 +jsonschema==4.3.2 # via nbformat jupyter-client==7.1.0 # via @@ -161,9 +161,9 @@ k8s-proto==0.0.3 # via flytekit keyring==23.4.0 # via flytekit -lazy-object-proxy==1.6.0 +lazy-object-proxy==1.7.1 # via astroid -lxml==4.6.5 +lxml==4.7.1 # via sphinx-material markupsafe==2.0.1 # via jinja2 @@ -184,7 +184,7 @@ mypy-extensions==0.4.3 # via # black # typing-inspect -natsort==8.0.0 +natsort==8.0.2 # via flytekit nbclient==0.5.9 # via @@ -197,11 +197,11 @@ nbformat==5.1.3 # nbclient # nbconvert # papermill -nest-asyncio==1.5.2 +nest-asyncio==1.5.4 # via # jupyter-client # nbclient -numpy==1.21.4 +numpy==1.21.5 # via # flytekit # pandas @@ -212,7 +212,7 @@ packaging==21.3 # via # bleach # sphinx -pandas==1.3.4 +pandas==1.3.5 # via flytekit pandocfilters==1.5.0 # via nbconvert @@ -232,7 +232,7 @@ platformdirs==2.4.0 # via black poyo==0.5.0 # via cookiecutter -prompt-toolkit==3.0.23 +prompt-toolkit==3.0.24 # via ipython protobuf==3.19.1 # via @@ -283,10 +283,9 @@ python-slugify[unidecode]==5.0.2 # sphinx-material pytimeparse==1.1.8 # via flytekit -pytz==2018.4 +pytz==2021.3 # via # babel - # flytekit # pandas pyyaml==6.0 # via @@ -295,9 +294,7 @@ pyyaml==6.0 pyzmq==22.3.0 # via jupyter-client regex==2021.11.10 - # via - # black - # docker-image-py + # via docker-image-py requests==2.26.0 # via # cookiecutter @@ -339,7 +336,7 @@ sortedcontainers==2.4.0 # via flytekit soupsieve==2.3.1 # via beautifulsoup4 -sphinx==4.3.1 +sphinx==4.3.2 # via # -r doc-requirements.in # furo @@ -391,7 +388,7 @@ textwrap3==0.9.2 # via ansiwrap thrift==0.15.0 # via hmsclient -tomli==1.2.2 +tomli==1.2.3 # via black tornado==6.1 # via diff --git a/requirements-spark2.txt b/requirements-spark2.txt index a0457279bc..0ba0d63ded 100644 --- a/requirements-spark2.txt +++ b/requirements-spark2.txt @@ -22,13 +22,13 @@ bcrypt==3.2.0 # via paramiko binaryornot==0.4.4 # via cookiecutter -black==21.11b1 +black==21.12b0 # via papermill bleach==4.1.0 # via nbconvert -boto3==1.20.17 +boto3==1.20.24 # via sagemaker-training -botocore==1.23.17 +botocore==1.23.24 # via # boto3 # s3transfer @@ -41,7 +41,7 @@ cffi==1.15.0 # pynacl chardet==4.0.0 # via binaryornot -charset-normalizer==2.0.8 +charset-normalizer==2.0.9 # via requests checksumdir==1.2.0 # via flytekit @@ -56,9 +56,9 @@ cloudpickle==2.0.0 # via flytekit cookiecutter==1.7.3 # via flytekit -croniter==1.0.15 +croniter==1.1.0 # via flytekit -cryptography==36.0.0 +cryptography==36.0.1 # via # paramiko # secretstorage @@ -83,25 +83,25 @@ entrypoints==0.3 # jupyter-client # nbconvert # papermill -flyteidl==0.21.11 +flyteidl==0.21.13 # via flytekit -gevent==21.8.0 +gevent==21.12.0 # via sagemaker-training greenlet==1.1.2 # via gevent -grpcio==1.42.0 +grpcio==1.43.0 # via flytekit hmsclient==0.1.1 # via flytekit idna==3.3 # via requests -importlib-metadata==4.8.2 +importlib-metadata==4.10.0 # via keyring inotify_simple==1.2.1 # via sagemaker-training ipykernel==5.5.6 # via flytekit -ipython==7.30.0 +ipython==7.30.1 # via ipykernel ipython-genutils==0.2.0 # via @@ -162,7 +162,7 @@ mypy-extensions==0.4.3 # via # black # typing-inspect -natsort==8.0.0 +natsort==8.0.2 # via flytekit nbclient==0.5.9 # via @@ -175,11 +175,11 @@ nbformat==5.1.3 # nbclient # nbconvert # papermill -nest-asyncio==1.5.2 +nest-asyncio==1.5.4 # via # jupyter-client # nbclient -numpy==1.21.4 +numpy==1.21.5 # via # flytekit # pandas @@ -188,7 +188,7 @@ numpy==1.21.4 # scipy packaging==21.3 # via bleach -pandas==1.3.4 +pandas==1.3.5 # via flytekit pandocfilters==1.5.0 # via nbconvert @@ -208,7 +208,7 @@ platformdirs==2.4.0 # via black poyo==0.5.0 # via cookiecutter -prompt-toolkit==3.0.23 +prompt-toolkit==3.0.24 # via ipython protobuf==3.19.1 # via @@ -255,10 +255,8 @@ python-slugify==5.0.2 # via cookiecutter pytimeparse==1.1.8 # via flytekit -pytz==2018.4 - # via - # flytekit - # pandas +pytz==2021.3 + # via pandas pyyaml==5.4.1 # via # -r requirements.in @@ -266,9 +264,7 @@ pyyaml==5.4.1 pyzmq==22.3.0 # via jupyter-client regex==2021.11.10 - # via - # black - # docker-image-py + # via docker-image-py requests==2.26.0 # via # cookiecutter @@ -317,7 +313,7 @@ textwrap3==0.9.2 # via ansiwrap thrift==0.15.0 # via hmsclient -tomli==1.2.2 +tomli==1.2.3 # via black tornado==6.1 # via diff --git a/requirements.txt b/requirements.txt index 344af69890..9aacef2d24 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,13 +20,13 @@ bcrypt==3.2.0 # via paramiko binaryornot==0.4.4 # via cookiecutter -black==21.11b1 +black==21.12b0 # via papermill bleach==4.1.0 # via nbconvert -boto3==1.20.17 +boto3==1.20.25 # via sagemaker-training -botocore==1.23.17 +botocore==1.23.25 # via # boto3 # s3transfer @@ -39,7 +39,7 @@ cffi==1.15.0 # pynacl chardet==4.0.0 # via binaryornot -charset-normalizer==2.0.8 +charset-normalizer==2.0.9 # via requests checksumdir==1.2.0 # via flytekit @@ -54,9 +54,9 @@ cloudpickle==2.0.0 # via flytekit cookiecutter==1.7.3 # via flytekit -croniter==1.0.15 +croniter==1.1.0 # via flytekit -cryptography==36.0.0 +cryptography==36.0.1 # via # paramiko # secretstorage @@ -81,25 +81,25 @@ entrypoints==0.3 # jupyter-client # nbconvert # papermill -flyteidl==0.21.11 +flyteidl==0.21.13 # via flytekit -gevent==21.8.0 +gevent==21.12.0 # via sagemaker-training greenlet==1.1.2 # via gevent -grpcio==1.42.0 +grpcio==1.43.0 # via flytekit hmsclient==0.1.1 # via flytekit idna==3.3 # via requests -importlib-metadata==4.8.2 +importlib-metadata==4.10.0 # via keyring inotify_simple==1.2.1 # via sagemaker-training ipykernel==5.5.6 # via flytekit -ipython==7.30.0 +ipython==7.30.1 # via ipykernel ipython-genutils==0.2.0 # via @@ -160,7 +160,7 @@ mypy-extensions==0.4.3 # via # black # typing-inspect -natsort==8.0.0 +natsort==8.0.2 # via flytekit nbclient==0.5.9 # via @@ -173,11 +173,11 @@ nbformat==5.1.3 # nbclient # nbconvert # papermill -nest-asyncio==1.5.2 +nest-asyncio==1.5.4 # via # jupyter-client # nbclient -numpy==1.21.4 +numpy==1.21.5 # via # flytekit # pandas @@ -186,7 +186,7 @@ numpy==1.21.4 # scipy packaging==21.3 # via bleach -pandas==1.3.4 +pandas==1.3.5 # via flytekit pandocfilters==1.5.0 # via nbconvert @@ -206,7 +206,7 @@ platformdirs==2.4.0 # via black poyo==0.5.0 # via cookiecutter -prompt-toolkit==3.0.23 +prompt-toolkit==3.0.24 # via ipython protobuf==3.19.1 # via @@ -253,7 +253,7 @@ python-slugify==5.0.2 # via cookiecutter pytimeparse==1.1.8 # via flytekit -pytz==2018.4 +pytz==2021.3 # via # flytekit # pandas @@ -264,9 +264,7 @@ pyyaml==5.4.1 pyzmq==22.3.0 # via jupyter-client regex==2021.11.10 - # via - # black - # docker-image-py + # via docker-image-py requests==2.26.0 # via # cookiecutter @@ -315,7 +313,7 @@ textwrap3==0.9.2 # via ansiwrap thrift==0.15.0 # via hmsclient -tomli==1.2.2 +tomli==1.2.3 # via black tornado==6.1 # via diff --git a/setup.py b/setup.py index 305e3d3700..9d1a1acbc7 100644 --- a/setup.py +++ b/setup.py @@ -76,7 +76,7 @@ "protobuf>=3.6.1,<4", "python-json-logger>=2.0.0", "pytimeparse>=1.1.8,<2.0.0", - "pytz>=2017.2,<2018.5", + "pytz", "keyring>=18.0.1", "requests>=2.18.4,<3.0.0", "responses>=0.10.7", 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 f9ecc1e38d..cec1da7299 100644 --- a/tests/flytekit/integration/remote/mock_flyte_repo/workflows/requirements.txt +++ b/tests/flytekit/integration/remote/mock_flyte_repo/workflows/requirements.txt @@ -14,7 +14,7 @@ cffi==1.15.0 # via cryptography chardet==4.0.0 # via binaryornot -charset-normalizer==2.0.8 +charset-normalizer==2.0.9 # via requests checksumdir==1.2.0 # via flytekit @@ -26,9 +26,9 @@ cloudpickle==2.0.0 # via flytekit cookiecutter==1.7.3 # via flytekit -croniter==1.0.15 +croniter==1.1.0 # via flytekit -cryptography==36.0.0 +cryptography==36.0.1 # via secretstorage cycler==0.11.0 # via matplotlib @@ -44,17 +44,17 @@ docker-image-py==0.1.12 # via flytekit docstring-parser==0.13 # via flytekit -flyteidl==0.21.11 +flyteidl==0.21.13 # via flytekit -flytekit==0.24.0 +flytekit==0.25.0 # via -r tests/flytekit/integration/remote/mock_flyte_repo/workflows/requirements.in -fonttools==4.28.2 +fonttools==4.28.5 # via matplotlib -grpcio==1.42.0 +grpcio==1.43.0 # via flytekit idna==3.3 # via requests -importlib-metadata==4.8.2 +importlib-metadata==4.10.0 # via keyring jeepney==0.7.1 # via @@ -83,13 +83,13 @@ marshmallow-enum==1.5.1 # via dataclasses-json marshmallow-jsonschema==0.13.0 # via flytekit -matplotlib==3.5.0 +matplotlib==3.5.1 # via -r tests/flytekit/integration/remote/mock_flyte_repo/workflows/requirements.in mypy-extensions==0.4.3 # via typing-inspect -natsort==8.0.0 +natsort==8.0.2 # via flytekit -numpy==1.21.4 +numpy==1.21.5 # via # matplotlib # opencv-python @@ -98,10 +98,8 @@ numpy==1.21.4 opencv-python==4.5.4.60 # via -r tests/flytekit/integration/remote/mock_flyte_repo/workflows/requirements.in packaging==21.3 - # via - # matplotlib - # setuptools-scm -pandas==1.3.4 + # via matplotlib +pandas==1.3.5 # via flytekit pillow==8.4.0 # via matplotlib @@ -151,8 +149,6 @@ retry==0.9.2 # via flytekit secretstorage==3.3.1 # via keyring -setuptools-scm==6.3.2 - # via matplotlib six==1.16.0 # via # cookiecutter @@ -166,8 +162,6 @@ statsd==3.3.0 # via flytekit text-unidecode==1.3 # via python-slugify -tomli==1.2.2 - # via setuptools-scm typing-extensions==4.0.1 # via typing-inspect typing-inspect==0.7.1 @@ -187,6 +181,3 @@ wrapt==1.13.3 # flytekit zipp==3.6.0 # via importlib-metadata - -# The following packages are considered to be unsafe in a requirements file: -# setuptools