From ab840030e7a248b54a95d21a9bf73f3d1d48a8a6 Mon Sep 17 00:00:00 2001
From: Kevin Su <pingsutw@apache.org>
Date: Tue, 11 Jan 2022 20:07:08 +0800
Subject: [PATCH 1/4] Update requirements

Signed-off-by: Kevin Su <pingsutw@apache.org>
---
 dev-requirements.in     |  2 +-
 dev-requirements.txt    | 51 ++++++++++++++------------------------
 doc-requirements.in     |  2 +-
 doc-requirements.txt    | 29 +++++++++-------------
 requirements-spark2.txt | 55 +++++++++++++++++++----------------------
 requirements.txt        | 55 +++++++++++++++++++----------------------
 6 files changed, 83 insertions(+), 111 deletions(-)

diff --git a/dev-requirements.in b/dev-requirements.in
index 9743d0fc20..c8eb2c0601 100644
--- a/dev-requirements.in
+++ b/dev-requirements.in
@@ -1,6 +1,6 @@
 -c requirements.txt
 
-git+git://github.com/flyteorg/pytest-flyte@main#egg=pytest-flyte
+git+https://github.com/flyteorg/pytest-flyte@main#egg=pytest-flyte
 coverage[toml]
 joblib
 mock
diff --git a/dev-requirements.txt b/dev-requirements.txt
index 8cc4f7ba3f..719271f85f 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -18,8 +18,6 @@ attrs==20.3.0
     #   jsonschema
     #   pytest
     #   pytest-docker
-backports.entry-points-selectable==1.1.1
-    # via virtualenv
 bcrypt==3.2.0
     # via
     #   -c requirements.txt
@@ -44,7 +42,7 @@ chardet==4.0.0
     # via
     #   -c requirements.txt
     #   binaryornot
-charset-normalizer==2.0.9
+charset-normalizer==2.0.10
     # via
     #   -c requirements.txt
     #   requests
@@ -77,12 +75,11 @@ cryptography==36.0.1
     # via
     #   -c requirements.txt
     #   paramiko
-    #   secretstorage
 dataclasses-json==0.5.6
     # via
     #   -c requirements.txt
     #   flytekit
-decorator==5.1.0
+decorator==5.1.1
     # via
     #   -c requirements.txt
     #   retry
@@ -90,7 +87,7 @@ deprecated==1.2.13
     # via
     #   -c requirements.txt
     #   flytekit
-diskcache==5.3.0
+diskcache==5.4.0
     # via
     #   -c requirements.txt
     #   flytekit
@@ -116,9 +113,9 @@ docstring-parser==0.13
     # via
     #   -c requirements.txt
     #   flytekit
-filelock==3.4.0
+filelock==3.4.2
     # via virtualenv
-flyteidl==0.21.13
+flyteidl==0.21.19
     # via
     #   -c requirements.txt
     #   flytekit
@@ -126,7 +123,7 @@ grpcio==1.43.0
     # via
     #   -c requirements.txt
     #   flytekit
-identify==2.4.0
+identify==2.4.2
     # via pre-commit
 idna==3.3
     # via
@@ -138,11 +135,6 @@ importlib-metadata==4.10.0
     #   keyring
 iniconfig==1.1.1
     # via pytest
-jeepney==0.7.1
-    # via
-    #   -c requirements.txt
-    #   keyring
-    #   secretstorage
 jinja2==3.0.3
     # via
     #   -c requirements.txt
@@ -159,7 +151,7 @@ jsonschema==3.2.0
     # via
     #   -c requirements.txt
     #   docker-compose
-keyring==23.4.0
+keyring==23.5.0
     # via
     #   -c requirements.txt
     #   flytekit
@@ -183,7 +175,7 @@ marshmallow-jsonschema==0.13.0
     #   flytekit
 mock==4.0.3
     # via -r dev-requirements.in
-mypy==0.930
+mypy==0.931
     # via -r dev-requirements.in
 mypy-extensions==0.4.3
     # via
@@ -196,7 +188,7 @@ natsort==8.0.2
     #   flytekit
 nodeenv==1.6.0
     # via pre-commit
-numpy==1.21.5
+numpy==1.22.0
     # via
     #   -c requirements.txt
     #   pandas
@@ -209,11 +201,11 @@ pandas==1.3.5
     # via
     #   -c requirements.txt
     #   flytekit
-paramiko==2.8.1
+paramiko==2.9.2
     # via
     #   -c requirements.txt
     #   docker
-platformdirs==2.4.0
+platformdirs==2.4.1
     # via
     #   -c requirements.txt
     #   virtualenv
@@ -225,7 +217,7 @@ poyo==0.5.0
     #   cookiecutter
 pre-commit==2.16.0
     # via -r dev-requirements.in
-protobuf==3.19.1
+protobuf==3.19.3
     # via
     #   -c requirements.txt
     #   flyteidl
@@ -243,7 +235,7 @@ pycparser==2.21
     # via
     #   -c requirements.txt
     #   cffi
-pynacl==1.4.0
+pynacl==1.5.0
     # via
     #   -c requirements.txt
     #   paramiko
@@ -262,7 +254,7 @@ pytest==6.2.5
     #   pytest-flyte
 pytest-docker==0.10.3
     # via pytest-flyte
-pytest-flyte @ git+git://github.com/flyteorg/pytest-flyte@main
+pytest-flyte @ git+https://github.com/flyteorg/pytest-flyte@main
     # via -r dev-requirements.in
 python-dateutil==2.8.1
     # via
@@ -299,7 +291,7 @@ regex==2021.11.10
     # via
     #   -c requirements.txt
     #   docker-image-py
-requests==2.26.0
+requests==2.27.1
     # via
     #   -c requirements.txt
     #   cookiecutter
@@ -307,7 +299,7 @@ requests==2.26.0
     #   docker-compose
     #   flytekit
     #   responses
-responses==0.16.0
+responses==0.17.0
     # via
     #   -c requirements.txt
     #   flytekit
@@ -315,10 +307,6 @@ retry==0.9.2
     # via
     #   -c requirements.txt
     #   flytekit
-secretstorage==3.3.1
-    # via
-    #   -c requirements.txt
-    #   keyring
 six==1.16.0
     # via
     #   -c requirements.txt
@@ -328,7 +316,6 @@ six==1.16.0
     #   flytekit
     #   grpcio
     #   jsonschema
-    #   pynacl
     #   python-dateutil
     #   responses
     #   virtualenv
@@ -365,13 +352,13 @@ typing-inspect==0.7.1
     # via
     #   -c requirements.txt
     #   dataclasses-json
-urllib3==1.26.7
+urllib3==1.26.8
     # via
     #   -c requirements.txt
     #   flytekit
     #   requests
     #   responses
-virtualenv==20.10.0
+virtualenv==20.13.0
     # via pre-commit
 websocket-client==0.59.0
     # via
@@ -386,7 +373,7 @@ wrapt==1.13.3
     #   -c requirements.txt
     #   deprecated
     #   flytekit
-zipp==3.6.0
+zipp==3.7.0
     # via
     #   -c requirements.txt
     #   importlib-metadata
diff --git a/doc-requirements.in b/doc-requirements.in
index 9cc60cfd43..972e5cf166 100644
--- a/doc-requirements.in
+++ b/doc-requirements.in
@@ -1,7 +1,7 @@
 .[all]
 -e file:.#egg=flytekit
 
-git+git://github.com/flyteorg/furo@main
+git+https://github.com/flyteorg/furo@main
 sphinx
 sphinx-gallery
 sphinx-prompt
diff --git a/doc-requirements.txt b/doc-requirements.txt
index 6ad35bfea2..baadec977c 100644
--- a/doc-requirements.txt
+++ b/doc-requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
+# This file is autogenerated by pip-compile with python 3.9
 # To update, run:
 #
 #    make doc-requirements.txt
@@ -16,7 +16,7 @@ appnope==0.1.2
     #   ipython
 arrow==1.2.1
     # via jinja2-time
-astroid==2.9.2
+astroid==2.9.3
     # via sphinx-autoapi
 attrs==21.4.0
     # via jsonschema
@@ -37,9 +37,9 @@ black==21.12b0
     # via papermill
 bleach==4.1.0
     # via nbconvert
-boto3==1.20.30
+boto3==1.20.32
     # via sagemaker-training
-botocore==1.23.30
+botocore==1.23.32
     # via
     #   boto3
     #   s3transfer
@@ -98,9 +98,9 @@ entrypoints==0.3
     #   jupyter-client
     #   nbconvert
     #   papermill
-flyteidl==0.21.17
+flyteidl==0.21.19
     # via flytekit
-furo @ git+git://github.com/flyteorg/furo@main
+furo @ git+https://github.com/flyteorg/furo@main
     # via -r doc-requirements.in
 gevent==21.12.0
     # via sagemaker-training
@@ -118,8 +118,6 @@ imagesize==1.3.0
     # via sphinx
 importlib-metadata==4.10.0
     # via keyring
-importlib-resources==5.4.0
-    # via jsonschema
 inotify_simple==1.2.1
     # via sagemaker-training
 ipykernel==5.5.6
@@ -219,7 +217,7 @@ pandocfilters==1.5.0
     # via nbconvert
 papermill==2.3.3
     # via flytekit
-paramiko==2.9.1
+paramiko==2.9.2
     # via sagemaker-training
 parso==0.8.3
     # via jedi
@@ -235,7 +233,7 @@ poyo==0.5.0
     # via cookiecutter
 prompt-toolkit==3.0.24
     # via ipython
-protobuf==3.19.1
+protobuf==3.19.3
     # via
     #   flyteidl
     #   flytekit
@@ -260,7 +258,7 @@ pygments==2.11.2
     #   nbconvert
     #   sphinx
     #   sphinx-prompt
-pynacl==1.4.0
+pynacl==1.5.0
     # via paramiko
 pyparsing==3.0.6
     # via packaging
@@ -304,7 +302,7 @@ requests==2.27.1
     #   papermill
     #   responses
     #   sphinx
-responses==0.16.0
+responses==0.17.0
     # via flytekit
 retry==0.9.2
     # via flytekit
@@ -323,7 +321,6 @@ six==1.16.0
     #   cookiecutter
     #   flytekit
     #   grpcio
-    #   pynacl
     #   python-dateutil
     #   responses
     #   retrying
@@ -417,7 +414,7 @@ unidecode==1.3.2
     # via
     #   python-slugify
     #   sphinx-autoapi
-urllib3==1.26.7
+urllib3==1.26.8
     # via
     #   botocore
     #   flytekit
@@ -437,9 +434,7 @@ wrapt==1.13.3
     #   deprecated
     #   flytekit
 zipp==3.7.0
-    # via
-    #   importlib-metadata
-    #   importlib-resources
+    # via importlib-metadata
 zope.event==4.5.0
     # via gevent
 zope.interface==5.4.0
diff --git a/requirements-spark2.txt b/requirements-spark2.txt
index a48ec4b5e2..626998e7eb 100644
--- a/requirements-spark2.txt
+++ b/requirements-spark2.txt
@@ -10,6 +10,10 @@
     #   -r requirements.in
 ansiwrap==0.8.4
     # via papermill
+appnope==0.1.2
+    # via
+    #   ipykernel
+    #   ipython
 arrow==1.2.1
     # via jinja2-time
 attrs==20.3.0
@@ -26,9 +30,9 @@ black==21.12b0
     # via papermill
 bleach==4.1.0
     # via nbconvert
-boto3==1.20.26
+boto3==1.20.32
     # via sagemaker-training
-botocore==1.23.26
+botocore==1.23.32
     # via
     #   boto3
     #   s3transfer
@@ -41,7 +45,7 @@ cffi==1.15.0
     #   pynacl
 chardet==4.0.0
     # via binaryornot
-charset-normalizer==2.0.9
+charset-normalizer==2.0.10
     # via requests
 checksumdir==1.2.0
     # via flytekit
@@ -59,12 +63,10 @@ cookiecutter==1.7.3
 croniter==1.1.0
     # via flytekit
 cryptography==36.0.1
-    # via
-    #   paramiko
-    #   secretstorage
+    # via paramiko
 dataclasses-json==0.5.6
     # via flytekit
-decorator==5.1.0
+decorator==5.1.1
     # via
     #   ipython
     #   retry
@@ -72,7 +74,7 @@ defusedxml==0.7.1
     # via nbconvert
 deprecated==1.2.13
     # via flytekit
-diskcache==5.3.0
+diskcache==5.4.0
     # via flytekit
 docker-image-py==0.1.12
     # via flytekit
@@ -83,7 +85,7 @@ entrypoints==0.3
     #   jupyter-client
     #   nbconvert
     #   papermill
-flyteidl==0.21.13
+flyteidl==0.21.19
     # via flytekit
 gevent==21.12.0
     # via sagemaker-training
@@ -101,7 +103,7 @@ inotify_simple==1.2.1
     # via sagemaker-training
 ipykernel==5.5.6
     # via flytekit
-ipython==7.30.1
+ipython==7.31.0
     # via ipykernel
 ipython-genutils==0.2.0
     # via
@@ -109,10 +111,6 @@ ipython-genutils==0.2.0
     #   nbformat
 jedi==0.18.1
     # via ipython
-jeepney==0.7.1
-    # via
-    #   keyring
-    #   secretstorage
 jinja2==3.0.3
     # via
     #   cookiecutter
@@ -141,7 +139,7 @@ jupyterlab-pygments==0.1.2
     # via nbconvert
 k8s-proto==0.0.3
     # via flytekit
-keyring==23.4.0
+keyring==23.5.0
     # via flytekit
 markupsafe==2.0.1
     # via jinja2
@@ -168,7 +166,7 @@ nbclient==0.5.9
     # via
     #   nbconvert
     #   papermill
-nbconvert==6.3.0
+nbconvert==6.4.0
     # via flytekit
 nbformat==5.1.3
     # via
@@ -179,7 +177,7 @@ nest-asyncio==1.5.4
     # via
     #   jupyter-client
     #   nbclient
-numpy==1.21.5
+numpy==1.22.0
     # via
     #   flytekit
     #   pandas
@@ -194,7 +192,7 @@ pandocfilters==1.5.0
     # via nbconvert
 papermill==2.3.3
     # via flytekit
-paramiko==2.8.1
+paramiko==2.9.2
     # via sagemaker-training
 parso==0.8.3
     # via jedi
@@ -204,19 +202,19 @@ pexpect==4.8.0
     # via ipython
 pickleshare==0.7.5
     # via ipython
-platformdirs==2.4.0
+platformdirs==2.4.1
     # via black
 poyo==0.5.0
     # via cookiecutter
 prompt-toolkit==3.0.24
     # via ipython
-protobuf==3.19.1
+protobuf==3.19.3
     # via
     #   flyteidl
     #   flytekit
     #   k8s-proto
     #   sagemaker-training
-psutil==5.8.0
+psutil==5.9.0
     # via sagemaker-training
 ptyprocess==0.7.0
     # via pexpect
@@ -228,12 +226,12 @@ pyarrow==6.0.1
     # via flytekit
 pycparser==2.21
     # via cffi
-pygments==2.10.0
+pygments==2.11.2
     # via
     #   ipython
     #   jupyterlab-pygments
     #   nbconvert
-pynacl==1.4.0
+pynacl==1.5.0
     # via paramiko
 pyparsing==3.0.6
     # via packaging
@@ -267,13 +265,13 @@ pyzmq==22.3.0
     # via jupyter-client
 regex==2021.11.10
     # via docker-image-py
-requests==2.26.0
+requests==2.27.1
     # via
     #   cookiecutter
     #   flytekit
     #   papermill
     #   responses
-responses==0.16.0
+responses==0.17.0
     # via flytekit
 retry==0.9.2
     # via flytekit
@@ -285,8 +283,6 @@ sagemaker-training==3.9.2
     # via flytekit
 scipy==1.7.3
     # via sagemaker-training
-secretstorage==3.3.1
-    # via keyring
 six==1.16.0
     # via
     #   bcrypt
@@ -295,7 +291,6 @@ six==1.16.0
     #   flytekit
     #   grpcio
     #   jsonschema
-    #   pynacl
     #   python-dateutil
     #   responses
     #   retrying
@@ -339,7 +334,7 @@ typing-extensions==4.0.1
     #   typing-inspect
 typing-inspect==0.7.1
     # via dataclasses-json
-urllib3==1.26.7
+urllib3==1.26.8
     # via
     #   botocore
     #   flytekit
@@ -357,7 +352,7 @@ wrapt==1.13.3
     # via
     #   deprecated
     #   flytekit
-zipp==3.6.0
+zipp==3.7.0
     # via importlib-metadata
 zope.event==4.5.0
     # via gevent
diff --git a/requirements.txt b/requirements.txt
index 04cdd38a16..35b68ab540 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,6 +8,10 @@
     # via -r requirements.in
 ansiwrap==0.8.4
     # via papermill
+appnope==0.1.2
+    # via
+    #   ipykernel
+    #   ipython
 arrow==1.2.1
     # via jinja2-time
 attrs==20.3.0
@@ -24,9 +28,9 @@ black==21.12b0
     # via papermill
 bleach==4.1.0
     # via nbconvert
-boto3==1.20.26
+boto3==1.20.32
     # via sagemaker-training
-botocore==1.23.26
+botocore==1.23.32
     # via
     #   boto3
     #   s3transfer
@@ -39,7 +43,7 @@ cffi==1.15.0
     #   pynacl
 chardet==4.0.0
     # via binaryornot
-charset-normalizer==2.0.9
+charset-normalizer==2.0.10
     # via requests
 checksumdir==1.2.0
     # via flytekit
@@ -57,12 +61,10 @@ cookiecutter==1.7.3
 croniter==1.1.0
     # via flytekit
 cryptography==36.0.1
-    # via
-    #   paramiko
-    #   secretstorage
+    # via paramiko
 dataclasses-json==0.5.6
     # via flytekit
-decorator==5.1.0
+decorator==5.1.1
     # via
     #   ipython
     #   retry
@@ -70,7 +72,7 @@ defusedxml==0.7.1
     # via nbconvert
 deprecated==1.2.13
     # via flytekit
-diskcache==5.3.0
+diskcache==5.4.0
     # via flytekit
 docker-image-py==0.1.12
     # via flytekit
@@ -81,7 +83,7 @@ entrypoints==0.3
     #   jupyter-client
     #   nbconvert
     #   papermill
-flyteidl==0.21.13
+flyteidl==0.21.19
     # via flytekit
 gevent==21.12.0
     # via sagemaker-training
@@ -99,7 +101,7 @@ inotify_simple==1.2.1
     # via sagemaker-training
 ipykernel==5.5.6
     # via flytekit
-ipython==7.30.1
+ipython==7.31.0
     # via ipykernel
 ipython-genutils==0.2.0
     # via
@@ -107,10 +109,6 @@ ipython-genutils==0.2.0
     #   nbformat
 jedi==0.18.1
     # via ipython
-jeepney==0.7.1
-    # via
-    #   keyring
-    #   secretstorage
 jinja2==3.0.3
     # via
     #   cookiecutter
@@ -139,7 +137,7 @@ jupyterlab-pygments==0.1.2
     # via nbconvert
 k8s-proto==0.0.3
     # via flytekit
-keyring==23.4.0
+keyring==23.5.0
     # via flytekit
 markupsafe==2.0.1
     # via jinja2
@@ -166,7 +164,7 @@ nbclient==0.5.9
     # via
     #   nbconvert
     #   papermill
-nbconvert==6.3.0
+nbconvert==6.4.0
     # via flytekit
 nbformat==5.1.3
     # via
@@ -177,7 +175,7 @@ nest-asyncio==1.5.4
     # via
     #   jupyter-client
     #   nbclient
-numpy==1.21.5
+numpy==1.22.0
     # via
     #   flytekit
     #   pandas
@@ -192,7 +190,7 @@ pandocfilters==1.5.0
     # via nbconvert
 papermill==2.3.3
     # via flytekit
-paramiko==2.8.1
+paramiko==2.9.2
     # via sagemaker-training
 parso==0.8.3
     # via jedi
@@ -202,19 +200,19 @@ pexpect==4.8.0
     # via ipython
 pickleshare==0.7.5
     # via ipython
-platformdirs==2.4.0
+platformdirs==2.4.1
     # via black
 poyo==0.5.0
     # via cookiecutter
 prompt-toolkit==3.0.24
     # via ipython
-protobuf==3.19.1
+protobuf==3.19.3
     # via
     #   flyteidl
     #   flytekit
     #   k8s-proto
     #   sagemaker-training
-psutil==5.8.0
+psutil==5.9.0
     # via sagemaker-training
 ptyprocess==0.7.0
     # via pexpect
@@ -226,12 +224,12 @@ pyarrow==6.0.1
     # via flytekit
 pycparser==2.21
     # via cffi
-pygments==2.10.0
+pygments==2.11.2
     # via
     #   ipython
     #   jupyterlab-pygments
     #   nbconvert
-pynacl==1.4.0
+pynacl==1.5.0
     # via paramiko
 pyparsing==3.0.6
     # via packaging
@@ -265,13 +263,13 @@ pyzmq==22.3.0
     # via jupyter-client
 regex==2021.11.10
     # via docker-image-py
-requests==2.26.0
+requests==2.27.1
     # via
     #   cookiecutter
     #   flytekit
     #   papermill
     #   responses
-responses==0.16.0
+responses==0.17.0
     # via flytekit
 retry==0.9.2
     # via flytekit
@@ -283,8 +281,6 @@ sagemaker-training==3.9.2
     # via flytekit
 scipy==1.7.3
     # via sagemaker-training
-secretstorage==3.3.1
-    # via keyring
 six==1.16.0
     # via
     #   bcrypt
@@ -293,7 +289,6 @@ six==1.16.0
     #   flytekit
     #   grpcio
     #   jsonschema
-    #   pynacl
     #   python-dateutil
     #   responses
     #   retrying
@@ -337,7 +332,7 @@ typing-extensions==4.0.1
     #   typing-inspect
 typing-inspect==0.7.1
     # via dataclasses-json
-urllib3==1.26.7
+urllib3==1.26.8
     # via
     #   botocore
     #   flytekit
@@ -355,7 +350,7 @@ wrapt==1.13.3
     # via
     #   deprecated
     #   flytekit
-zipp==3.6.0
+zipp==3.7.0
     # via importlib-metadata
 zope.event==4.5.0
     # via gevent

From e3bed746b78b9ccd8fc652d07df5d0496b766b25 Mon Sep 17 00:00:00 2001
From: Kevin Su <pingsutw@apache.org>
Date: Tue, 11 Jan 2022 21:27:04 +0800
Subject: [PATCH 2/4] Update requirements

Signed-off-by: Kevin Su <pingsutw@apache.org>
---
 .github/workflows/pythonbuild.yml | 8 ++++----
 Makefile                          | 2 +-
 requirements-spark2.txt           | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/pythonbuild.yml b/.github/workflows/pythonbuild.yml
index ce4b272426..e6d5976fff 100644
--- a/.github/workflows/pythonbuild.yml
+++ b/.github/workflows/pythonbuild.yml
@@ -36,7 +36,7 @@ jobs:
         key: ${{ format('{0}-pip-{1}', runner.os, hashFiles('dev-requirements.txt', format('requirements{0}.txt', matrix.spark-version-suffix))) }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip==21.2.4 setuptools wheel
+        python -m pip install --upgrade pip==21.3.1 setuptools wheel
         make setup${{ matrix.spark-version-suffix }}
         pip freeze
     - name: Test with coverage
@@ -96,7 +96,7 @@ jobs:
         key: ${{ format('{0}-pip-{1}', runner.os, hashFiles('dev-requirements.txt', format('plugins/{0}/requirements.txt', matrix.plugin-names ))) }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip==21.2.4 setuptools wheel
+        python -m pip install --upgrade pip==21.3.1 setuptools wheel
         make setup
         cd plugins/${{ matrix.plugin-names }}
         pip install -e .
@@ -124,7 +124,7 @@ jobs:
             ${{ runner.os }}-pip-
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip==21.2.4
+          python -m pip install --upgrade pip==21.3.1
           pip install -r dev-requirements.txt
       - name: Lint
         run: |
@@ -146,7 +146,7 @@ jobs:
           python-version: 3.8
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip==21.2.4 setuptools wheel
+          python -m pip install --upgrade pip==21.3.1 setuptools wheel
           pip install -r doc-requirements.txt
       - name: Build the documentation
         run: make -C docs html
diff --git a/Makefile b/Makefile
index b1088aece7..4d0dae8198 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ help:
 
 .PHONY: install-piptools
 install-piptools:
-	pip install -U pip-tools pip==21.2.4
+	pip install -U pip-tools pip==21.3.1
 
 .PHONY: update_boilerplate
 update_boilerplate:
diff --git a/requirements-spark2.txt b/requirements-spark2.txt
index 626998e7eb..cd9017a933 100644
--- a/requirements-spark2.txt
+++ b/requirements-spark2.txt
@@ -220,7 +220,7 @@ ptyprocess==0.7.0
     # via pexpect
 py==1.11.0
     # via retry
-py4j==0.10.9.2
+py4j==0.10.7
     # via pyspark
 pyarrow==6.0.1
     # via flytekit
@@ -237,7 +237,7 @@ pyparsing==3.0.6
     # via packaging
 pyrsistent==0.18.0
     # via jsonschema
-pyspark==3.2.0
+pyspark==2.4.8
     # via flytekit
 python-dateutil==2.8.1
     # via

From 79f061433208afb6c88dfa24262fc36b802dc4a7 Mon Sep 17 00:00:00 2001
From: Kevin Su <pingsutw@apache.org>
Date: Tue, 11 Jan 2022 21:50:21 +0800
Subject: [PATCH 3/4] Update requirements

Signed-off-by: Kevin Su <pingsutw@apache.org>
---
 .github/workflows/pythonbuild.yml | 8 ++++----
 Makefile                          | 2 +-
 dev-requirements.txt              | 2 +-
 requirements-spark2.txt           | 7 ++++---
 requirements.in                   | 1 +
 requirements.txt                  | 3 ++-
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/pythonbuild.yml b/.github/workflows/pythonbuild.yml
index e6d5976fff..ce4b272426 100644
--- a/.github/workflows/pythonbuild.yml
+++ b/.github/workflows/pythonbuild.yml
@@ -36,7 +36,7 @@ jobs:
         key: ${{ format('{0}-pip-{1}', runner.os, hashFiles('dev-requirements.txt', format('requirements{0}.txt', matrix.spark-version-suffix))) }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip==21.3.1 setuptools wheel
+        python -m pip install --upgrade pip==21.2.4 setuptools wheel
         make setup${{ matrix.spark-version-suffix }}
         pip freeze
     - name: Test with coverage
@@ -96,7 +96,7 @@ jobs:
         key: ${{ format('{0}-pip-{1}', runner.os, hashFiles('dev-requirements.txt', format('plugins/{0}/requirements.txt', matrix.plugin-names ))) }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip==21.3.1 setuptools wheel
+        python -m pip install --upgrade pip==21.2.4 setuptools wheel
         make setup
         cd plugins/${{ matrix.plugin-names }}
         pip install -e .
@@ -124,7 +124,7 @@ jobs:
             ${{ runner.os }}-pip-
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip==21.3.1
+          python -m pip install --upgrade pip==21.2.4
           pip install -r dev-requirements.txt
       - name: Lint
         run: |
@@ -146,7 +146,7 @@ jobs:
           python-version: 3.8
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip==21.3.1 setuptools wheel
+          python -m pip install --upgrade pip==21.2.4 setuptools wheel
           pip install -r doc-requirements.txt
       - name: Build the documentation
         run: make -C docs html
diff --git a/Makefile b/Makefile
index 4d0dae8198..b1088aece7 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ help:
 
 .PHONY: install-piptools
 install-piptools:
-	pip install -U pip-tools pip==21.3.1
+	pip install -U pip-tools pip==21.2.4
 
 .PHONY: update_boilerplate
 update_boilerplate:
diff --git a/dev-requirements.txt b/dev-requirements.txt
index 719271f85f..903a5b35bb 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -188,7 +188,7 @@ natsort==8.0.2
     #   flytekit
 nodeenv==1.6.0
     # via pre-commit
-numpy==1.22.0
+numpy==1.21.5
     # via
     #   -c requirements.txt
     #   pandas
diff --git a/requirements-spark2.txt b/requirements-spark2.txt
index cd9017a933..ff4118683a 100644
--- a/requirements-spark2.txt
+++ b/requirements-spark2.txt
@@ -177,8 +177,9 @@ nest-asyncio==1.5.4
     # via
     #   jupyter-client
     #   nbclient
-numpy==1.22.0
+numpy==1.21.5
     # via
+    #   -r requirements.in
     #   flytekit
     #   pandas
     #   pyarrow
@@ -220,7 +221,7 @@ ptyprocess==0.7.0
     # via pexpect
 py==1.11.0
     # via retry
-py4j==0.10.7
+py4j==0.10.9.2
     # via pyspark
 pyarrow==6.0.1
     # via flytekit
@@ -237,7 +238,7 @@ pyparsing==3.0.6
     # via packaging
 pyrsistent==0.18.0
     # via jsonschema
-pyspark==2.4.8
+pyspark==3.2.0
     # via flytekit
 python-dateutil==2.8.1
     # via
diff --git a/requirements.in b/requirements.in
index 408185fca8..4aac1f39dc 100644
--- a/requirements.in
+++ b/requirements.in
@@ -7,3 +7,4 @@ attrs<21
 # https://github.com/flyteorg/flyte/issues/1732.
 jsonschema<4
 pyyaml<6
+numpy==1.21.5
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 35b68ab540..1ace694988 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -175,8 +175,9 @@ nest-asyncio==1.5.4
     # via
     #   jupyter-client
     #   nbclient
-numpy==1.22.0
+numpy==1.21.5
     # via
+    #   -r requirements.in
     #   flytekit
     #   pandas
     #   pyarrow

From e5bea358d63da97121873f4d05dd5985d3df84dc Mon Sep 17 00:00:00 2001
From: Kevin Su <pingsutw@apache.org>
Date: Tue, 11 Jan 2022 22:01:40 +0800
Subject: [PATCH 4/4] Fix lint

Signed-off-by: Kevin Su <pingsutw@apache.org>
---
 requirements.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.in b/requirements.in
index 4aac1f39dc..d0d8477e10 100644
--- a/requirements.in
+++ b/requirements.in
@@ -7,4 +7,4 @@ attrs<21
 # https://github.com/flyteorg/flyte/issues/1732.
 jsonschema<4
 pyyaml<6
-numpy==1.21.5
\ No newline at end of file
+numpy==1.21.5
