You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ro...@apache.org on 2017/09/20 22:34:58 UTC

[1/2] beam git commit: Closes #3872

Repository: beam
Updated Branches:
  refs/heads/master 59542c3cc -> fe395900a


Closes #3872


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

Branch: refs/heads/master
Commit: fe395900a80abba3fd60f10399f0273fb0206eb9
Parents: 59542c3 fe6e95b
Author: Robert Bradshaw <ro...@gmail.com>
Authored: Wed Sep 20 15:34:41 2017 -0700
Committer: Robert Bradshaw <ro...@gmail.com>
Committed: Wed Sep 20 15:34:41 2017 -0700

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

[2/2] beam git commit: Exclude incompatible six release, part 2

Posted by ro...@apache.org.
Exclude incompatible six release, part 2


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

Branch: refs/heads/master
Commit: fe6e95b28da11b2556e449c3c8e6bc5c8f42dde2
Parents: 59542c3
Author: Charles Chen <cc...@google.com>
Authored: Wed Sep 20 12:26:39 2017 -0700
Committer: Robert Bradshaw <ro...@gmail.com>
Committed: Wed Sep 20 15:34:41 2017 -0700

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


http://git-wip-us.apache.org/repos/asf/beam/blob/fe6e95b2/sdks/python/setup.py
----------------------------------------------------------------------
diff --git a/sdks/python/setup.py b/sdks/python/setup.py
index 2bc2e99..cac2ea7 100644
--- a/sdks/python/setup.py
+++ b/sdks/python/setup.py
@@ -104,6 +104,9 @@ REQUIRED_PACKAGES = [
     'oauth2client>=2.0.1,<4.0.0',
     'protobuf>=3.2.0,<=3.3.0',
     'pyyaml>=3.12,<4.0.0',
+    # Six 1.11.0 incompatible with apitools.
+    # TODO(BEAM-2964): Remove the upper bound.
+    'six>=1.9,<1.11',
     'typing>=3.6.0,<3.7.0',
     ]