From 15626bfe037ce639e2f3e888bb61fefef34da8b3 Mon Sep 17 00:00:00 2001 From: Charles Chen Date: Mon, 22 Aug 2016 10:08:01 -0700 Subject: [PATCH 1/2] Allow Google Cloud Dataflow workflows to use ".dev" workers --- sdks/python/apache_beam/utils/dependency.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sdks/python/apache_beam/utils/dependency.py b/sdks/python/apache_beam/utils/dependency.py index aacaf903740c..8e04cb835ff6 100644 --- a/sdks/python/apache_beam/utils/dependency.py +++ b/sdks/python/apache_beam/utils/dependency.py @@ -431,7 +431,11 @@ def get_required_container_version(): version = pkg.get_distribution(GOOGLE_PACKAGE_NAME).version # We drop any pre/post parts of the version and we keep only the X.Y.Z # format. For instance the 0.3.0rc2 SDK version translates into 0.3.0. - return '%s.%s.%s' % pkg.parse_version(version)._version.release + container_version = '%s.%s.%s' % pkg.parse_version(version)._version.release + # We do, however, keep the ".dev" suffix if it is present. + if re.match(r'.*\.dev[0-9]*$', version): + container_version += '.dev' + return container_version except pkg.DistributionNotFound: # This case covers Apache Beam end-to-end testing scenarios. All these tests # will run with a special container version. From 7551ce9694674df4f363201d66fd661ed5af7544 Mon Sep 17 00:00:00 2001 From: Charles Chen Date: Mon, 22 Aug 2016 11:10:47 -0700 Subject: [PATCH 2/2] Fix import of "re". --- sdks/python/apache_beam/utils/dependency.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sdks/python/apache_beam/utils/dependency.py b/sdks/python/apache_beam/utils/dependency.py index 8e04cb835ff6..9585887e4731 100644 --- a/sdks/python/apache_beam/utils/dependency.py +++ b/sdks/python/apache_beam/utils/dependency.py @@ -55,6 +55,7 @@ import glob import logging import os +import re import shutil import tempfile