[
https://issues.apache.org/jira/browse/BEAM-3174?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16297685#comment-16297685
]
ASF GitHub Bot commented on BEAM-3174:
--------------------------------------
aaltay closed pull request #4125: [BEAM-3174] If parse_version just gives us a
regular tuple use that for formatting
URL: https://github.com/apache/beam/pull/4125
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/sdks/python/apache_beam/runners/dataflow/internal/dependency.py
b/sdks/python/apache_beam/runners/dataflow/internal/dependency.py
index fba2df27551..fc0ce2cfd6e 100644
--- a/sdks/python/apache_beam/runners/dataflow/internal/dependency.py
+++ b/sdks/python/apache_beam/runners/dataflow/internal/dependency.py
@@ -54,7 +54,6 @@
import glob
import logging
import os
-import re
import shutil
import sys
import tempfile
@@ -544,15 +543,7 @@ def _get_required_container_version(job_type=None):
"""
# TODO(silviuc): Handle apache-beam versions when we have official releases.
try:
- version = pkg_resources.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.
- container_version = (
- '%s.%s.%s' % pkg_resources.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
+ return pkg_resources.get_distribution(GOOGLE_PACKAGE_NAME).version
except pkg_resources.DistributionNotFound:
# This case covers Apache Beam end-to-end testing scenarios. All these
tests
# will run with a special container version.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Master python sdk seems broken with
> test_harness_override_present_in_dataflow_distributions on Py 2.7.6
> -------------------------------------------------------------------------------------------------------
>
> Key: BEAM-3174
> URL: https://issues.apache.org/jira/browse/BEAM-3174
> Project: Beam
> Issue Type: Bug
> Components: sdk-py-core
> Reporter: holdenk
> Assignee: Valentyn Tymofieiev
>
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
