[flink] branch release-1.17 updated: [FLINK-32962][python] Remove pip version check on installing dependencies.

[hong]

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

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


The following commit(s) were added to refs/heads/release-1.17 by this push:
     new f786dbea0be [FLINK-32962][python] Remove pip version check on 
installing dependencies.
f786dbea0be is described below

commit f786dbea0be25cc62dc10311a8d64d9de2ee20dd
Author: Aleksandr Pilipenko <z3d...@gmail.com>
AuthorDate: Fri Aug 25 21:37:00 2023 +0100

    [FLINK-32962][python] Remove pip version check on installing dependencies.
---
 .../python/util/PythonEnvironmentManagerUtils.java | 25 +++-------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git 
a/flink-python/src/main/java/org/apache/flink/python/util/PythonEnvironmentManagerUtils.java
 
b/flink-python/src/main/java/org/apache/flink/python/util/PythonEnvironmentManagerUtils.java
index 2aecd009e6d..b271c41a63f 100644
--- 
a/flink-python/src/main/java/org/apache/flink/python/util/PythonEnvironmentManagerUtils.java
+++ 
b/flink-python/src/main/java/org/apache/flink/python/util/PythonEnvironmentManagerUtils.java
@@ -58,12 +58,6 @@ public class PythonEnvironmentManagerUtils {
                     + "import sysconfig;"
                     + "print(sysconfig.get_path('platlib', vars={'base': 
sys.argv[1], 'platbase': sys.argv[1]}))";
 
-    private static final String CHECK_PIP_VERSION_SCRIPT =
-            "import sys;"
-                    + "from pkg_resources import get_distribution, 
parse_version;"
-                    + "pip_version = get_distribution('pip').version;"
-                    + "print(parse_version(pip_version) >= 
parse_version(sys.argv[1]))";
-
     private static final String GET_RUNNER_DIR_SCRIPT =
             "import pyflink;"
                     + "import os;"
@@ -105,13 +99,9 @@ public class PythonEnvironmentManagerUtils {
                                 "install",
                                 "--ignore-installed",
                                 "-r",
-                                requirementsFilePath));
-        if (isPipVersionGreaterEqual("8.0.0", pythonExecutable, 
environmentVariables)) {
-            commands.addAll(Arrays.asList("--prefix", requirementsInstallDir));
-        } else {
-            commands.addAll(
-                    Arrays.asList("--install-option", "--prefix=" + 
requirementsInstallDir));
-        }
+                                requirementsFilePath,
+                                "--prefix",
+                                requirementsInstallDir));
         if (requirementsCacheDir != null) {
             commands.addAll(Arrays.asList("--no-index", "--find-links", 
requirementsCacheDir));
         }
@@ -173,15 +163,6 @@ public class PythonEnvironmentManagerUtils {
         return String.join(File.pathSeparator, out.trim().split("\n"));
     }
 
-    private static boolean isPipVersionGreaterEqual(
-            String pipVersion, String pythonExecutable, Map<String, String> 
environmentVariables)
-            throws IOException {
-        String[] commands =
-                new String[] {pythonExecutable, "-c", 
CHECK_PIP_VERSION_SCRIPT, pipVersion};
-        String out = execute(commands, environmentVariables, false);
-        return Boolean.parseBoolean(out.trim());
-    }
-
     private static String execute(
             String[] commands, Map<String, String> environmentVariables, 
boolean logDetails)
             throws IOException {