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/10/11 00:06:40 UTC
[1/2] beam git commit: Make linter happy.
Repository: beam
Updated Branches:
refs/heads/master cf8993699 -> 90f34f289
Make linter happy.
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/34a2e0c8
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/34a2e0c8
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/34a2e0c8
Branch: refs/heads/master
Commit: 34a2e0c8cec9fa9f3925dea3a5af5cb03c83e328
Parents: cf89936
Author: Valentyn Tymofieiev <va...@google.com>
Authored: Tue Oct 10 12:45:25 2017 -0700
Committer: Ahmet Altay <al...@google.com>
Committed: Tue Oct 10 17:06:19 2017 -0700
----------------------------------------------------------------------
.../apache_beam/runners/dataflow/internal/apiclient_test.py | 4 +++-
sdks/python/apache_beam/runners/dataflow/internal/dependency.py | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/34a2e0c8/sdks/python/apache_beam/runners/dataflow/internal/apiclient_test.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/runners/dataflow/internal/apiclient_test.py b/sdks/python/apache_beam/runners/dataflow/internal/apiclient_test.py
index ce28928..fa4f89a 100644
--- a/sdks/python/apache_beam/runners/dataflow/internal/apiclient_test.py
+++ b/sdks/python/apache_beam/runners/dataflow/internal/apiclient_test.py
@@ -16,7 +16,9 @@
#
"""Unit tests for the apiclient module."""
import unittest
+
import mock
+import pkg_resources
from apache_beam.metrics.cells import DistributionData
from apache_beam.options.pipeline_options import PipelineOptions
@@ -31,7 +33,6 @@ except ImportError:
apiclient = None
# pylint: enable=wrong-import-order, wrong-import-position
-import pkg_resources
@unittest.skipIf(apiclient is None, 'GCP dependencies are not installed')
class UtilTest(unittest.TestCase):
@@ -172,5 +173,6 @@ class UtilTest(unittest.TestCase):
env = apiclient.Environment([], pipeline_options, '2.2.0')
self.assertNotIn(override, env.proto.experiments)
+
if __name__ == '__main__':
unittest.main()
http://git-wip-us.apache.org/repos/asf/beam/blob/34a2e0c8/sdks/python/apache_beam/runners/dataflow/internal/dependency.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/runners/dataflow/internal/dependency.py b/sdks/python/apache_beam/runners/dataflow/internal/dependency.py
index 4988dab..123fc49 100644
--- a/sdks/python/apache_beam/runners/dataflow/internal/dependency.py
+++ b/sdks/python/apache_beam/runners/dataflow/internal/dependency.py
@@ -59,6 +59,8 @@ import shutil
import sys
import tempfile
+import pkg_resources
+
from apache_beam import version as beam_version
from apache_beam.internal import pickler
from apache_beam.io.filesystems import FileSystems
@@ -67,8 +69,6 @@ from apache_beam.options.pipeline_options import SetupOptions
from apache_beam.runners.dataflow.internal import names
from apache_beam.utils import processes
-import pkg_resources
-
# All constants are for internal use only; no backwards-compatibility
# guarantees.
[2/2] beam git commit: This closes #3972
Posted by al...@apache.org.
This closes #3972
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/90f34f28
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/90f34f28
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/90f34f28
Branch: refs/heads/master
Commit: 90f34f28933bddb8346364e709a8fe12a4b20f45
Parents: cf89936 34a2e0c
Author: Ahmet Altay <al...@google.com>
Authored: Tue Oct 10 17:06:28 2017 -0700
Committer: Ahmet Altay <al...@google.com>
Committed: Tue Oct 10 17:06:28 2017 -0700
----------------------------------------------------------------------
.../apache_beam/runners/dataflow/internal/apiclient_test.py | 4 +++-
sdks/python/apache_beam/runners/dataflow/internal/dependency.py | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------