fix marshmallow-enum bug (#1746)

* fix marchmallow-enum bug Signed-off-by: Niels Bantilan <[email protected]> * Remove constraints in requirements.in Signed-off-by: eduardo apolinario <[email protected]> * Fix test_dataclass_transformer Signed-off-by: eduardo apolinario <[email protected]> * Remove more dev dependencies Signed-off-by: eduardo apolinario <[email protected]> * Revert "Fix test_dataclass_transformer" This reverts commit 7d92b0f. Signed-off-by: eduardo apolinario <[email protected]> * Set upper bound ot dataclasses-json Signed-off-by: eduardo apolinario <[email protected]> * Set pyyaml version to 5.4.1 Signed-off-by: eduardo apolinario <[email protected]> --------- Signed-off-by: Niels Bantilan <[email protected]> Signed-off-by: eduardo apolinario <[email protected]> Co-authored-by: eduardo apolinario <[email protected]>
flyteorg · Jul 17, 2023 · bc298bf · bc298bf
1 parent ecbca6d
commit bc298bf
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git 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
@@ -905,7 +905,7 @@ pytz-deprecation-shim==0.1.0.post0
     # via tzlocal
 pywavelets==1.4.1
     # via imagehash
-pyyaml==6.0
+pyyaml==5.4.1
     # via
     #   astropy
     #   cookiecutter

diff --git 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
@@ -52,16 +52,19 @@
         "python-json-logger>=2.0.0",
         "pytimeparse>=1.1.8,<2.0.0",
         "pytz",
-        "pyyaml",
+        "pyyaml>=6.0.0; python_version>='3.10'",
+        "pyyaml<6.0.0; python_version<'3.10'",
         "keyring>=18.0.1",
         "requests>=2.18.4,<3.0.0",
         "responses>=0.10.7",
         "sortedcontainers>=1.5.9,<3.0.0",
         "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",
+        # TODO: remove upper-bound after fixing change in contract
+        "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",