You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by al...@apache.org on 2017/08/29 19:00:04 UTC
[1/2] beam git commit: Remove the circular dependency between
pipeline & runner
Repository: beam
Updated Branches:
refs/heads/master f816ad879 -> 1c26b7488
Remove the circular dependency between pipeline & runner
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/12362b94
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/12362b94
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/12362b94
Branch: refs/heads/master
Commit: 12362b949e8f558548a886e832af31cac21db6b3
Parents: f816ad8
Author: Ahmet Altay <al...@google.com>
Authored: Fri Aug 25 18:21:11 2017 -0700
Committer: Ahmet Altay <al...@google.com>
Committed: Tue Aug 29 11:59:11 2017 -0700
----------------------------------------------------------------------
sdks/python/apache_beam/runners/dataflow/dataflow_runner.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/12362b94/sdks/python/apache_beam/runners/dataflow/dataflow_runner.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/runners/dataflow/dataflow_runner.py b/sdks/python/apache_beam/runners/dataflow/dataflow_runner.py
index 2b52f78..56cc46c 100644
--- a/sdks/python/apache_beam/runners/dataflow/dataflow_runner.py
+++ b/sdks/python/apache_beam/runners/dataflow/dataflow_runner.py
@@ -40,7 +40,6 @@ from apache_beam.runners.dataflow.internal import names
from apache_beam.runners.dataflow.internal.clients import dataflow as dataflow_api
from apache_beam.runners.dataflow.internal.names import PropertyNames
from apache_beam.runners.dataflow.internal.names import TransformNames
-from apache_beam.runners.dataflow.ptransform_overrides import CreatePTransformOverride
from apache_beam.runners.runner import PValueCache
from apache_beam.runners.runner import PipelineResult
from apache_beam.runners.runner import PipelineRunner
@@ -72,6 +71,11 @@ class DataflowRunner(PipelineRunner):
# not change.
# For internal SDK use only. This should not be updated by Beam pipeline
# authors.
+
+ # Imported here to avoid circular dependencies.
+ # TODO: Remove the apache_beam.pipeline dependency in CreatePTransformOverride
+ from apache_beam.runners.dataflow.ptransform_overrides import CreatePTransformOverride
+
_PTRANSFORM_OVERRIDES = [
CreatePTransformOverride(),
]
[2/2] beam git commit: This closes #3770
Posted by al...@apache.org.
This closes #3770
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/1c26b748
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/1c26b748
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/1c26b748
Branch: refs/heads/master
Commit: 1c26b748823c559d6bc1474fa6194953a0287a8e
Parents: f816ad8 12362b9
Author: Ahmet Altay <al...@google.com>
Authored: Tue Aug 29 11:59:44 2017 -0700
Committer: Ahmet Altay <al...@google.com>
Committed: Tue Aug 29 11:59:44 2017 -0700
----------------------------------------------------------------------
sdks/python/apache_beam/runners/dataflow/dataflow_runner.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------