[v1.6 Patch] Gate grpcio, pyyaml (#1771)

* Fail CI tests faster Signed-off-by: eduardo apolinario <[email protected]> * gate grpcio and pyyaml Signed-off-by: Yee Hing Tong <[email protected]> * Bring #1746 as well Signed-off-by: eduardo apolinario <[email protected]> --------- Signed-off-by: eduardo apolinario <[email protected]> Signed-off-by: Yee Hing Tong <[email protected]> Co-authored-by: eduardo apolinario <[email protected]>
flyteorg · Jul 28, 2023 · 60c982e · 60c982e
1 parent f671fb6
commit 60c982e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 18 deletions.
diff --git a/.github/workflows/pythonbuild.yml b/.github/workflows/pythonbuild.yml
@@ -38,8 +38,7 @@ jobs:
           key: ${{ format('{0}-pip-{1}', runner.os, hashFiles('dev-requirements.in', 'requirements.in')) }}
       - name: Install dependencies
         run: |
-          make setup
-          pip freeze
+          make setup && pip freeze
       - name: Test with coverage
         run: |
           make unit_test_codecov
@@ -49,6 +48,7 @@ jobs:
           fail_ci_if_error: false
 
   build-plugins:
+    needs: build
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false

diff --git a/.gitignore b/.gitignore
@@ -33,3 +33,4 @@ htmlcov
 *dat
 docs/source/_tags/
 .hypothesis
+.npm
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==6.0.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
@@ -40,8 +40,8 @@
         "python-dateutil>=2.1",
         # Restrict grpcio and grpcio-status.  Version 1.50.0 pulls in a version of protobuf that is not compatible
         # with the old protobuf library (as described in https://developers.google.com/protocol-buffers/docs/news/2022-05-06)
-        "grpcio>=1.50.0,!=1.55.0,<2.0",
-        "grpcio-status>=1.50.0,!=1.55.0,<2.0",
+        "grpcio>=1.50.0,!=1.55.0,<1.53.1",
+        "grpcio-status>=1.50.0,!=1.55.0,<1.53.1",
         "importlib-metadata",
         "fsspec>=2023.3.0",
         "adlfs",
@@ -52,16 +52,17 @@
         "python-json-logger>=2.0.0",
         "pytimeparse>=1.1.8,<2.0.0",
         "pytz",
-        "pyyaml",
+        "pyyaml!=6.0.0,!=5.4.0,!=5.4.1",  # pyyaml is broken with cython 3: https://github.com/yaml/pyyaml/issues/601
         "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",
+        "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",