diff --git a/dev-requirements.in b/dev-requirements.in index 5bb86ba612..bd16ba151a 100644 --- a/dev-requirements.in +++ b/dev-requirements.in @@ -1,6 +1,5 @@ -r requirements.in -git+https://github.com/flyteorg/pytest-flyte@main#egg=pytest-flyte coverage[toml] hypothesis joblib diff --git a/doc-requirements.txt b/doc-requirements.txt index 5264673f4f..07dd053070 100644 --- a/doc-requirements.txt +++ b/doc-requirements.txt @@ -905,7 +905,7 @@ pytz-deprecation-shim==0.1.0.post0 # via tzlocal pywavelets==1.4.1 # via imagehash -pyyaml==6.0 +pyyaml==6.0.1 # via # astropy # cookiecutter diff --git a/requirements.in b/requirements.in index 7fde6a085c..2f64b5fd14 100644 --- a/requirements.in +++ b/requirements.in @@ -1,12 +1,2 @@ -e file:.#egg=flytekit attrs<21 -# We need to restrict constrain the versions of both jsonschema and pyyaml because of docker-compose (which is -# used to run integration tests) pins those two libraries. We are in the process of removing docker-compose in -# favor of a more generic solution that involves Flytectl to stand up the sandbox, described in -# https://github.com/flyteorg/flyte/issues/1732. -jsonschema<4 -pyyaml<6 -# This is required by docker-compose and otherwise clashes with docker-py -websocket-client<1.0.0 -# TODO: Remove after buf migration is done and packages updated -packaging<22.0 diff --git a/setup.py b/setup.py index 0e7d5db8e3..ce8d450a8d 100644 --- a/setup.py +++ b/setup.py @@ -60,8 +60,9 @@ "statsd>=3.0.0,<4.0.0", "urllib3>=1.22,<2.0.0", "wrapt>=1.0.0,<2.0.0", - "dataclasses-json>=0.5.2", + "dataclasses-json>=0.5.2,<0.5.12", "marshmallow-jsonschema>=0.12.0", + "marshmallow-enum", "natsort>=7.0.1", "docker-image-py>=0.1.10", "typing_extensions",