[ZEPPELIN-5804] support python 3.10 (#4453)

apache · Sep 6, 2022 · f42943c · f42943c
1 parent 7134756
commit f42943c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/python/src/main/java/org/apache/zeppelin/python/IPythonInterpreter.java b/python/src/main/java/org/apache/zeppelin/python/IPythonInterpreter.java
@@ -173,9 +173,9 @@ protected Map<String, String> setupKernelEnv() throws IOException {
     Map<String, String> envs = super.setupKernelEnv();
     if (useBuiltinPy4j) {
       //TODO(zjffdu) don't do hard code on py4j here
-      File py4jDestFile = new File(kernelWorkDir, "py4j-src-0.10.7.zip");
+      File py4jDestFile = new File(kernelWorkDir, "py4j-src-0.10.9.7.zip");
       FileUtils.copyURLToFile(getClass().getClassLoader().getResource(
-              "python/py4j-src-0.10.7.zip"), py4jDestFile);
+              "python/py4j-src-0.10.9.7.zip"), py4jDestFile);
       if (additionalPythonPath != null) {
         // put the py4j at the end, because additionalPythonPath may already contain py4j.
         // e.g. IPySparkInterpreter

diff --git a/python/src/main/java/org/apache/zeppelin/python/PythonDockerInterpreter.java b/python/src/main/java/org/apache/zeppelin/python/PythonDockerInterpreter.java
@@ -91,7 +91,7 @@ public InterpreterResult interpret(String st, InterpreterContext context)
           ":/_zeppelin ";
 
       // set PYTHONPATH
-      String pythonPath = ".:/_python_workdir/py4j-src-0.10.7.zip:/_python_workdir";
+      String pythonPath = ".:/_python_workdir/py4j-src-0.10.9.7.zip:/_python_workdir";
 
       setPythonCommand("docker run -i --rm " +
           mountPythonScript +

diff --git a/python/src/main/java/org/apache/zeppelin/python/PythonInterpreter.java b/python/src/main/java/org/apache/zeppelin/python/PythonInterpreter.java
@@ -191,7 +191,7 @@ private void createPythonScript() throws IOException {
     copyResourceToPythonWorkDir("python/zeppelin_context.py", "zeppelin_context.py");
     copyResourceToPythonWorkDir("python/backend_zinline.py", "backend_zinline.py");
     copyResourceToPythonWorkDir("python/mpl_config.py", "mpl_config.py");
-    copyResourceToPythonWorkDir("python/py4j-src-0.10.7.zip", "py4j-src-0.10.7.zip");
+    copyResourceToPythonWorkDir("python/py4j-src-0.10.9.7.zip", "py4j-src-0.10.9.7.zip");
   }
 
   protected boolean useIPython() {
@@ -217,7 +217,7 @@ protected Map<String, String> setupPythonEnv() throws IOException {
     Map<String, String> env = EnvironmentUtils.getProcEnvironment();
     appendToPythonPath(env, pythonWorkDir.getAbsolutePath());
     if (useBuiltinPy4j) {
-      appendToPythonPath(env, pythonWorkDir.getAbsolutePath() + "/py4j-src-0.10.7.zip");
+      appendToPythonPath(env, pythonWorkDir.getAbsolutePath() + "/py4j-src-0.10.9.7.zip");
     }
     LOGGER.info("PYTHONPATH: {}", env.get("PYTHONPATH"));
     return env;

diff --git a/python/src/main/resources/python/py4j-src-0.10.7.zip b/python/src/main/resources/python/py4j-src-0.10.7.zip
diff --git a/python/src/main/resources/python/py4j-src-0.10.9.7.zip b/python/src/main/resources/python/py4j-src-0.10.9.7.zip