beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rober...@apache.org
Subject [1/2] beam git commit: [BEAM-2366] Don't try to pickle gen_protos in tests.
Date Fri, 26 May 2017 20:53:02 GMT
Repository: beam
Updated Branches:
  refs/heads/master c7a37b4b1 -> b70e25cf9


[BEAM-2366] Don't try to pickle gen_protos in tests.

Tests that pickle the main session but are run from setup.py attempt
to pickle everything visible in setup.py.


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/6ec64b90
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/6ec64b90
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/6ec64b90

Branch: refs/heads/master
Commit: 6ec64b90b66de8693c833145c583ecb9cb2ae0f5
Parents: c7a37b4
Author: Robert Bradshaw <robertwb@gmail.com>
Authored: Thu May 25 16:17:54 2017 -0700
Committer: Robert Bradshaw <robertwb@gmail.com>
Committed: Fri May 26 13:52:48 2017 -0700

----------------------------------------------------------------------
 sdks/python/setup.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/6ec64b90/sdks/python/setup.py
----------------------------------------------------------------------
diff --git a/sdks/python/setup.py b/sdks/python/setup.py
index 8a8ce48..596c8c5 100644
--- a/sdks/python/setup.py
+++ b/sdks/python/setup.py
@@ -36,8 +36,6 @@ from setuptools.command.test import test
 
 from pkg_resources import get_distribution, DistributionNotFound
 
-import gen_protos
-
 
 def get_version():
   global_names = {}
@@ -127,6 +125,9 @@ GCP_REQUIREMENTS = [
 
 # We must generate protos after setup_requires are installed.
 def generate_protos_first(original_cmd):
+  # See https://issues.apache.org/jira/browse/BEAM-2366
+  # pylint: disable=wrong-import-position
+  import gen_protos
   class cmd(original_cmd, object):
     def run(self):
       gen_protos.generate_proto_files()


Mime
View raw message