You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2019/09/29 11:09:14 UTC
[flink] 01/01: [REMOVE] Disable Flink Python module
This is an automated email from the ASF dual-hosted git repository.
trohrmann pushed a commit to branch FLINK-14226
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 6ef3e94827bab16c9ead17712f2f490e88a65d83
Author: Till Rohrmann <tr...@apache.org>
AuthorDate: Fri Sep 27 15:36:01 2019 +0200
[REMOVE] Disable Flink Python module
---
flink-dist/src/main/assemblies/bin.xml | 24 ++++++-------
flink-dist/src/main/assemblies/opt.xml | 28 +++++++--------
pom.xml | 2 +-
tools/travis_controller.sh | 64 +++++++++++++++++-----------------
4 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/flink-dist/src/main/assemblies/bin.xml b/flink-dist/src/main/assemblies/bin.xml
index 8c549fb..d5a8ae5 100644
--- a/flink-dist/src/main/assemblies/bin.xml
+++ b/flink-dist/src/main/assemblies/bin.xml
@@ -115,12 +115,12 @@ under the License.
<fileMode>755</fileMode>
</fileSet>
- <!-- copy python scripts -->
- <fileSet>
- <directory>../flink-python/bin/</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>0755</fileMode>
- </fileSet>
+<!-- <!– copy python scripts –>-->
+<!-- <fileSet>-->
+<!-- <directory>../flink-python/bin/</directory>-->
+<!-- <outputDirectory>bin</outputDirectory>-->
+<!-- <fileMode>0755</fileMode>-->
+<!-- </fileSet>-->
<!-- copy SQL client -->
<fileSet>
@@ -257,12 +257,12 @@ under the License.
</includes>
</fileSet>
- <!-- copy python table example to examples of dist -->
- <fileSet>
- <directory>../flink-python/pyflink/table/examples</directory>
- <outputDirectory>examples/python/table</outputDirectory>
- <fileMode>0755</fileMode>
- </fileSet>
+<!-- <!– copy python table example to examples of dist –>-->
+<!-- <fileSet>-->
+<!-- <directory>../flink-python/pyflink/table/examples</directory>-->
+<!-- <outputDirectory>examples/python/table</outputDirectory>-->
+<!-- <fileMode>0755</fileMode>-->
+<!-- </fileSet>-->
<!-- copy jar file of the table examples -->
<fileSet>
diff --git a/flink-dist/src/main/assemblies/opt.xml b/flink-dist/src/main/assemblies/opt.xml
index e2dbd65..2fc0b46 100644
--- a/flink-dist/src/main/assemblies/opt.xml
+++ b/flink-dist/src/main/assemblies/opt.xml
@@ -161,21 +161,21 @@
<fileMode>0644</fileMode>
</file>
- <!-- Python -->
- <file>
- <source>../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>
+<!-- <!– Python –>-->
+<!-- <file>-->
+<!-- <source>../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>-->
</files>
- <fileSets>
- <fileSet>
- <directory>../flink-python/lib/</directory>
- <outputDirectory>opt/python/</outputDirectory>
- <fileMode>0644</fileMode>
- </fileSet>
- </fileSets>
+<!-- <fileSets>-->
+<!-- <fileSet>-->
+<!-- <directory>../flink-python/lib/</directory>-->
+<!-- <outputDirectory>opt/python/</outputDirectory>-->
+<!-- <fileMode>0644</fileMode>-->
+<!-- </fileSet>-->
+<!-- </fileSets>-->
<dependencySets>
<dependencySet>
<unpack>false</unpack>
diff --git a/pom.xml b/pom.xml
index bb21332..4cf2696 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,7 @@ under the License.
<module>flink-yarn-tests</module>
<module>flink-fs-tests</module>
<module>flink-docs</module>
- <module>flink-python</module>
+<!-- <module>flink-python</module>-->
<module>flink-ml-parent</module>
<module>flink-walkthroughs</module>
</modules>
diff --git a/tools/travis_controller.sh b/tools/travis_controller.sh
index 91392f6..64d0793 100755
--- a/tools/travis_controller.sh
+++ b/tools/travis_controller.sh
@@ -126,38 +126,38 @@ if [ $STAGE == "$STAGE_COMPILE" ]; then
echo "=============================================================================="
fi
- if [ $EXIT_CODE == 0 ]; then
- if [[ $PROFILE == *"scala-2.11"* ]]; then
- ./tools/releasing/collect_license_files.sh ./build-target
- diff "NOTICE-binary" "licenses-output/NOTICE-binary"
- EXIT_CODE=$(($EXIT_CODE+$?))
- diff -r "licenses-binary" "licenses-output/licenses-binary"
- EXIT_CODE=$(($EXIT_CODE+$?))
-
- if [ $EXIT_CODE != 0 ]; then
- echo "=============================================================================="
- echo "ERROR: binary licensing is out-of-date."
- echo "Please update NOTICE-binary and licenses-binary:"
- echo "Step 1: Rebuild flink"
- echo "Step 2: Run 'tools/releasing/collect_license_files.sh build-target'"
- echo " This extracts all the licensing files from the distribution, and puts them in 'licenses-output'."
- echo " If the build-target symlink does not exist after building flink, point the tool to 'flink-dist/target/flink-<version>-bin/flink-<version>' instead."
- echo "Step 3: Replace existing licensing"
- echo " Delete NOTICE-binary and the entire licenses-binary directory."
- echo " Copy the contents in 'licenses-output' into the root directory of the Flink project."
- echo "Step 4: Remember to commit the changes!"
- echo "=============================================================================="
- fi
- else
- echo "=============================================================================="
- echo "Ignoring the license file check because built uses different Scala version than 2.11. See FLINK-14008."
- echo "=============================================================================="
- fi
- else
- echo "=============================================================================="
- echo "Previous build failure detected, skipping licensing check."
- echo "=============================================================================="
- fi
+# if [ $EXIT_CODE == 0 ]; then
+# if [[ $PROFILE == *"scala-2.11"* ]]; then
+# ./tools/releasing/collect_license_files.sh ./build-target
+# diff "NOTICE-binary" "licenses-output/NOTICE-binary"
+# EXIT_CODE=$(($EXIT_CODE+$?))
+# diff -r "licenses-binary" "licenses-output/licenses-binary"
+# EXIT_CODE=$(($EXIT_CODE+$?))
+#
+# if [ $EXIT_CODE != 0 ]; then
+# echo "=============================================================================="
+# echo "ERROR: binary licensing is out-of-date."
+# echo "Please update NOTICE-binary and licenses-binary:"
+# echo "Step 1: Rebuild flink"
+# echo "Step 2: Run 'tools/releasing/collect_license_files.sh build-target'"
+# echo " This extracts all the licensing files from the distribution, and puts them in 'licenses-output'."
+# echo " If the build-target symlink does not exist after building flink, point the tool to 'flink-dist/target/flink-<version>-bin/flink-<version>' instead."
+# echo "Step 3: Replace existing licensing"
+# echo " Delete NOTICE-binary and the entire licenses-binary directory."
+# echo " Copy the contents in 'licenses-output' into the root directory of the Flink project."
+# echo "Step 4: Remember to commit the changes!"
+# echo "=============================================================================="
+# fi
+# else
+# echo "=============================================================================="
+# echo "Ignoring the license file check because built uses different Scala version than 2.11. See FLINK-14008."
+# echo "=============================================================================="
+# fi
+# else
+# echo "=============================================================================="
+# echo "Previous build failure detected, skipping licensing check."
+# echo "=============================================================================="
+# fi
if [ $EXIT_CODE == 0 ]; then
echo "Creating cache build directory $CACHE_FLINK_DIR"