Skip to content

Commit 171524f

Browse files
[FLINK-32971][python] Add proper development version support in pyflink
1 parent ab41e4f commit 171524f

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ flink-python/dev/.conda/
4343
flink-python/dev/log/
4444
flink-python/dev/.stage.txt
4545
flink-python/.eggs/
46-
flink-python/apache-flink-*.dev0/
47-
flink-python/apache-flink-libraries/apache_flink_libraries-*.dev0/
46+
flink-python/apache-flink-*.dev*/
47+
flink-python/apache-flink-libraries/apache_flink_libraries-*.dev*/
4848
flink-python/**/*.c
4949
flink-python/.idea/
5050
flink-python/**/*.so

flink-python/apache-flink-libraries/setup.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import io
2222
import os
2323
import platform
24+
import re
2425
import subprocess
2526
import sys
2627
from shutil import copytree, copy, rmtree
@@ -97,7 +98,7 @@ def find_file_path(pattern):
9798
print("Temp path for symlink to parent already exists {0}".format(TEMP_PATH),
9899
file=sys.stderr)
99100
sys.exit(-1)
100-
flink_version = VERSION.replace(".dev0", "-SNAPSHOT")
101+
flink_version = re.sub("[.]dev.*", "-SNAPSHOT", VERSION)
101102
FLINK_HOME = os.path.abspath(
102103
"../../flink-dist/target/flink-%s-bin/flink-%s" % (flink_version, flink_version))
103104

flink-python/setup.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import io
2121
import os
2222
import platform
23+
import re
2324
import sys
2425
from distutils.command.build_ext import build_ext
2526
from shutil import copytree, copy, rmtree
@@ -206,7 +207,7 @@ def extracted_output_files(base_dir, file_path, output_directory):
206207
print("Temp path for symlink to parent already exists {0}".format(TEMP_PATH),
207208
file=sys.stderr)
208209
sys.exit(-1)
209-
flink_version = VERSION.replace(".dev0", "-SNAPSHOT")
210+
flink_version = re.sub("[.]dev.*", "-SNAPSHOT", VERSION)
210211
FLINK_HOME = os.path.abspath(
211212
"../flink-dist/target/flink-%s-bin/flink-%s" % (flink_version, flink_version))
212213
FLINK_ROOT = os.path.abspath("..")
@@ -252,7 +253,7 @@ def extracted_output_files(base_dir, file_path, output_directory):
252253
"is complete, or do this in the flink-python directory of the flink source "
253254
"directory.")
254255
sys.exit(-1)
255-
if VERSION.find('dev0') != -1:
256+
if re.search('dev.*$', VERSION) is not None:
256257
apache_flink_libraries_dependency = 'apache-flink-libraries==%s' % VERSION
257258
else:
258259
split_versions = VERSION.split('.')

0 commit comments

Comments
 (0)