[v1.2] Backporting "Restrict numpy due to deprecated aliases (#1376)" (…

…#1377) * Restrict numpy due to deprecated aliases (#1376) Signed-off-by: Eduardo Apolinario <[email protected]> Signed-off-by: Eduardo Apolinario <[email protected]> Co-authored-by: Eduardo Apolinario <[email protected]> * Backport part of 1365 - fix papermill plugins dev-requirements Signed-off-by: Eduardo Apolinario <[email protected]> Signed-off-by: Eduardo Apolinario <[email protected]> Co-authored-by: Eduardo Apolinario <[email protected]>
flyteorg · Dec 19, 2022 · 1f5e4da · 1f5e4da
1 parent 72a1f07
commit 1f5e4da
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/plugins/flytekit-papermill/dev-requirements.in b/plugins/flytekit-papermill/dev-requirements.in
@@ -1,3 +1,3 @@
 flyteidl>=1.0.0
-flytekitplugins-pod==v1.2.0b0
-git+https://github.com/flyteorg/flytekit@master#egg=flytekitplugins-spark&subdirectory=plugins/flytekit-spark
+-e file:../../.#egg=flytekitplugins-pod&subdirectory=plugins/flytekit-k8s-pod
+-e file:../../.#egg=flytekitplugins-spark&subdirectory=plugins/flytekit-spark
diff --git a/plugins/flytekit-papermill/dev-requirements.txt b/plugins/flytekit-papermill/dev-requirements.txt
@@ -1,9 +1,13 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.7
+# by the following command:
 #
 #    pip-compile dev-requirements.in
 #
+-e file:../../.#egg=flytekitplugins-pod&subdirectory=plugins/flytekit-k8s-pod
+    # via -r dev-requirements.in
+-e file:../../.#egg=flytekitplugins-spark&subdirectory=plugins/flytekit-spark
+    # via -r dev-requirements.in
 arrow==1.2.1
     # via jinja2-time
 binaryornot==0.4.4
@@ -54,10 +58,6 @@ flytekit==1.1.0b0
     # via
     #   flytekitplugins-pod
     #   flytekitplugins-spark
-flytekitplugins-pod==v1.2.0b0
-    # via -r dev-requirements.in
-flytekitplugins-spark @ git+https://github.com/flyteorg/flytekit@master#subdirectory=plugins/flytekit-spark
-    # via -r dev-requirements.in
 google-auth==2.11.0
     # via kubernetes
 googleapis-common-protos==1.55.0
@@ -103,16 +103,15 @@ mypy-extensions==0.4.3
     # via typing-inspect
 natsort==8.0.2
     # via flytekit
-numpy==1.22.1
+numpy==1.21.6
     # via
+    #   flytekit
     #   pandas
     #   pyarrow
 oauthlib==3.2.1
     # via requests-oauthlib
 pandas==1.3.5
     # via flytekit
-poyo==0.5.0
-    # via cookiecutter
 protobuf==3.19.5
     # via
     #   flyteidl
@@ -157,6 +156,7 @@ pytz==2021.3
     #   pandas
 pyyaml==6.0
     # via
+    #   cookiecutter
     #   flytekit
     #   kubernetes
 regex==2021.11.10
@@ -179,9 +179,10 @@ rsa==4.9
     # via google-auth
 secretstorage==3.3.3
     # via keyring
+singledispatchmethod==1.0
+    # via flytekit
 six==1.16.0
     # via
-    #   cookiecutter
     #   google-auth
     #   grpcio
     #   kubernetes
@@ -195,7 +196,9 @@ text-unidecode==1.3
     # via python-slugify
 typing-extensions==4.0.1
     # via
+    #   arrow
     #   flytekit
+    #   importlib-metadata
     #   typing-inspect
 typing-inspect==0.7.1
     # via dataclasses-json

diff --git a/setup.py b/setup.py
@@ -79,6 +79,9 @@
         "cloudpickle>=2.0.0",
         "cookiecutter>=1.7.3",
         "numpy<1.22.0; python_version < '3.8.0'",
+        # TODO: We should remove mentions to the deprecated numpy
+        # aliases. More details in https://github.com/flyteorg/flyte/issues/3166
+        "numpy<1.24.0",
     ],
     extras_require=extras_require,
     scripts=[