This is an automated email from the ASF dual-hosted git repository.
uce pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new d637d86 [FLINK-11752] [dist] Move flink-python to opt (#7843)
d637d86 is described below
commit d637d8613d41ea023a29e123e375b54d0488a867
Author: Ufuk Celebi <[email protected]>
AuthorDate: Wed Feb 27 15:02:47 2019 +0100
[FLINK-11752] [dist] Move flink-python to opt (#7843)
* [FLINK-11752] [dist] Move flink-python to opt
* [FLINK-11752] [dist] Point pyflink scripts to opt
---
flink-dist/src/main/assemblies/bin.xml | 12 +-----------
flink-dist/src/main/assemblies/opt.xml | 8 ++++++++
flink-dist/src/main/flink-bin/bin/pyflink.bat | 2 +-
flink-dist/src/main/flink-bin/bin/pyflink.sh | 2 +-
4 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/flink-dist/src/main/assemblies/bin.xml
b/flink-dist/src/main/assemblies/bin.xml
index 7dc73b4..3eb5698 100644
--- a/flink-dist/src/main/assemblies/bin.xml
+++ b/flink-dist/src/main/assemblies/bin.xml
@@ -227,17 +227,7 @@ under the License.
<include>flink-gelly-examples_${scala.binary.version}-${project.version}.jar</include>
</includes>
</fileSet>
-
- <!-- copy python jar -->
- <fileSet>
-
<directory>../flink-libraries/flink-python/target</directory>
- <outputDirectory>lib</outputDirectory>
- <fileMode>0644</fileMode>
- <includes>
-
<include>flink-python_${scala.binary.version}-${project.version}.jar</include>
- </includes>
- </fileSet>
-
+
<!-- copy python example to examples of dist -->
<fileSet>
<directory>../flink-libraries/flink-python/src/main/python/org/apache/flink/python/api/flink/example</directory>
diff --git a/flink-dist/src/main/assemblies/opt.xml
b/flink-dist/src/main/assemblies/opt.xml
index 35a4d27..d7954af 100644
--- a/flink-dist/src/main/assemblies/opt.xml
+++ b/flink-dist/src/main/assemblies/opt.xml
@@ -162,6 +162,14 @@
<fileMode>0644</fileMode>
</file>
+ <!-- Batch Python API -->
+ <file>
+
<source>../flink-libraries/flink-python/target/flink-python_${scala.binary.version}-${project.version}.jar</source>
+ <outputDirectory>opt</outputDirectory>
+
<destName>flink-python_${scala.binary.version}-${project.version}.jar</destName>
+ <fileMode>0644</fileMode>
+ </file>
+
<!-- Streaming Python API -->
<file>
<source>../flink-libraries/flink-streaming-python/target/flink-streaming-python_${scala.binary.version}-${project.version}.jar</source>
diff --git a/flink-dist/src/main/flink-bin/bin/pyflink.bat
b/flink-dist/src/main/flink-bin/bin/pyflink.bat
index da180f3..4d7fa0e 100644
--- a/flink-dist/src/main/flink-bin/bin/pyflink.bat
+++ b/flink-dist/src/main/flink-bin/bin/pyflink.bat
@@ -22,4 +22,4 @@ setlocal EnableDelayedExpansion
SET bin=%~dp0
SET FLINK_ROOT_DIR=%bin%..
-"%FLINK_ROOT_DIR%\bin\flink" run -v "%FLINK_ROOT_DIR%"\lib\flink-python*.jar %*
\ No newline at end of file
+"%FLINK_ROOT_DIR%\bin\flink" run -v "%FLINK_ROOT_DIR%"\opt\flink-python*.jar %*
diff --git a/flink-dist/src/main/flink-bin/bin/pyflink.sh
b/flink-dist/src/main/flink-bin/bin/pyflink.sh
index 37679d3..9c998cd 100644
--- a/flink-dist/src/main/flink-bin/bin/pyflink.sh
+++ b/flink-dist/src/main/flink-bin/bin/pyflink.sh
@@ -22,4 +22,4 @@ bin=`cd "$bin"; pwd`
. "$bin"/config.sh
-"$FLINK_BIN_DIR"/flink run -v "$FLINK_ROOT_DIR"/lib/flink-python*.jar "$@"
+"$FLINK_BIN_DIR"/flink run -v "$FLINK_ROOT_DIR"/opt/flink-python*.jar "$@"
