You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by hx...@apache.org on 2022/11/18 07:57:27 UTC

[flink] 02/02: [FLINK-29817][python] Fix the metadata in PyFlink requirements

This is an automated email from the ASF dual-hosted git repository.

hxb pushed a commit to branch release-1.16
in repository https://gitbox.apache.org/repos/asf/flink.git

commit d5b10d8ec9ca9fa03201ce57421bb0e714e224a7
Author: huangxingbo <hx...@apache.org>
AuthorDate: Fri Nov 18 15:53:24 2022 +0800

    [FLINK-29817][python] Fix the metadata in PyFlink requirements
    
    This closes #21342.
---
 docs/content.zh/release-notes/flink-1.16.md |  2 +-
 docs/content/release-notes/flink-1.16.md    |  2 +-
 flink-python/dev/dev-requirements.txt       |  2 +-
 flink-python/setup.py                       | 17 ++++++-----------
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/docs/content.zh/release-notes/flink-1.16.md b/docs/content.zh/release-notes/flink-1.16.md
index d34755c8584..f953e977b0c 100644
--- a/docs/content.zh/release-notes/flink-1.16.md
+++ b/docs/content.zh/release-notes/flink-1.16.md
@@ -209,7 +209,7 @@ For support of Python3.9 and M1, PyFlink updates a series dependencies version:
     ```
     apache-beam==2.38.0
     arrow==5.0.0
-    pemja==0.2.4
+    pemja==0.2.6
     ```
 
 #### Update dependency version for system resources metrics
diff --git a/docs/content/release-notes/flink-1.16.md b/docs/content/release-notes/flink-1.16.md
index d34755c8584..f953e977b0c 100644
--- a/docs/content/release-notes/flink-1.16.md
+++ b/docs/content/release-notes/flink-1.16.md
@@ -209,7 +209,7 @@ For support of Python3.9 and M1, PyFlink updates a series dependencies version:
     ```
     apache-beam==2.38.0
     arrow==5.0.0
-    pemja==0.2.4
+    pemja==0.2.6
     ```
 
 #### Update dependency version for system resources metrics
diff --git a/flink-python/dev/dev-requirements.txt b/flink-python/dev/dev-requirements.txt
index ae602e878ca..9bb205f1fb7 100755
--- a/flink-python/dev/dev-requirements.txt
+++ b/flink-python/dev/dev-requirements.txt
@@ -31,6 +31,6 @@ numpy>=1.14.3,<1.20; python_version < '3.7'
 fastavro>=1.1.0,<1.4.8
 grpcio>=1.29.0,<=1.46.3
 grpcio-tools>=1.29.0,<=1.46.3
-pemja==0.2.4; python_version >= '3.7' and platform_system != 'Windows'
+pemja==0.2.6; python_version >= '3.7' and platform_system != 'Windows'
 httplib2>=0.19.0,<=0.20.4
 protobuf>=3.19.0,<=3.21
\ No newline at end of file
diff --git a/flink-python/setup.py b/flink-python/setup.py
index f0a83e09d08..f684099e129 100644
--- a/flink-python/setup.py
+++ b/flink-python/setup.py
@@ -312,21 +312,16 @@ try:
                         'cloudpickle==2.1.0', 'avro-python3>=1.8.1,!=1.9.2,<1.10.0',
                         'pytz>=2018.3', 'fastavro>=1.1.0,<1.4.8', 'requests>=2.26.0',
                         'protobuf>=3.19.0,<=3.21',
+                        'numpy>=1.14.3,<1.20; python_full_version < "3.7"',
+                        'numpy>=1.21.4,<1.22.0; python_full_version >= "3.7"',
+                        'pandas>=1.0,<1.2.0; python_full_version < "3.7"',
+                        'pandas>=1.3.0,<1.4.0; python_full_version >= "3.7"',
+                        'pyarrow>=0.15.1,<7.0.0; python_full_version < "3.7"',
+                        'pyarrow>=5.0.0,<9.0.0; python_full_version >= "3.7"',
                         'pemja==0.2.6;'
                         'python_full_version >= "3.7" and platform_system != "Windows"',
                         'httplib2>=0.19.0,<=0.20.4', apache_flink_libraries_dependency]
 
-    if sys.version_info < (3, 7):
-        # python 3.6 upper and lower limit
-        install_requires.append('numpy>=1.14.3,<1.20')
-        install_requires.append('pandas>=1.0,<1.2.0')
-        install_requires.append('pyarrow>=0.15.1,<7.0.0')
-    else:
-        # python 3.7, 3.8 and 3.9 upper limit and M1 chip lower limit,
-        install_requires.append('numpy>=1.21.4,<1.22.0')
-        install_requires.append('pandas>=1.3.0,<1.4.0')
-        install_requires.append('pyarrow>=5.0.0,<9.0.0')
-
     setup(
         name='apache-flink',
         version=VERSION,