You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by jo...@apache.org on 2022/09/06 09:23:40 UTC
[zeppelin] branch master updated: [ZEPPELIN-5804] support python 3.10 (#4453)
This is an automated email from the ASF dual-hosted git repository.
jongyoul pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/master by this push:
new f42943c6d5 [ZEPPELIN-5804] support python 3.10 (#4453)
f42943c6d5 is described below
commit f42943c6d5bc04498b7fc9ca518dc433091a9c9c
Author: Jiyun Park <51...@users.noreply.github.com>
AuthorDate: Tue Sep 6 18:23:28 2022 +0900
[ZEPPELIN-5804] support python 3.10 (#4453)
---
.../org/apache/zeppelin/python/IPythonInterpreter.java | 4 ++--
.../zeppelin/python/PythonDockerInterpreter.java | 2 +-
.../org/apache/zeppelin/python/PythonInterpreter.java | 4 ++--
python/src/main/resources/python/py4j-src-0.10.7.zip | Bin 208574 -> 0 bytes
python/src/main/resources/python/py4j-src-0.10.9.7.zip | Bin 0 -> 42424 bytes
5 files changed, 5 insertions(+), 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
index e482585c46..49721c760a 100644
--- 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 @@ public class IPythonInterpreter extends JupyterKernelInterpreter {
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
index 52caf35084..08812f31e7 100644
--- 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 class PythonDockerInterpreter extends Interpreter {
":/_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
index d45fb52a48..6dfea9941f 100644
--- 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 @@ public class PythonInterpreter extends Interpreter {
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 @@ public class PythonInterpreter extends Interpreter {
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
deleted file mode 100644
index 7884a7395f..0000000000
Binary files a/python/src/main/resources/python/py4j-src-0.10.7.zip and /dev/null differ
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
new file mode 100644
index 0000000000..6abba4efa0
Binary files /dev/null and b/python/src/main/resources/python/py4j-src-0.10.9.7.zip differ