You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by re...@apache.org on 2017/10/24 19:37:23 UTC
[3/7] beam git commit: Make linter happy.
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/2be277d3
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/2be277d3
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/2be277d3
Branch: refs/heads/release-2.2.0
Commit: 2be277d30ee2440716e87f8d1201760c380b06e8
Parents: c93ee2c
Author: Valentyn Tymofieiev <va...@google.com>
Authored: Tue Oct 10 12:45:25 2017 -0700
Committer: Valentyn Tymofieiev <va...@google.com>
Committed: Wed Oct 18 07:19:41 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/2be277d3/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/2be277d3/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.