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/19 17:57:23 UTC
[1/2] beam git commit: Closes #3865
Repository: beam
Updated Branches:
refs/heads/master c25bead55 -> 5dab9e109
Closes #3865
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/5dab9e10
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/5dab9e10
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/5dab9e10
Branch: refs/heads/master
Commit: 5dab9e109cffefb69ac6be22b2d902d5579797e1
Parents: c25bead b3a5b67
Author: Robert Bradshaw <ro...@gmail.com>
Authored: Tue Sep 19 10:57:08 2017 -0700
Committer: Robert Bradshaw <ro...@gmail.com>
Committed: Tue Sep 19 10:57:08 2017 -0700
----------------------------------------------------------------------
sdks/python/setup.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/2] beam git commit: [BEAM-2964] Exclude incompatible six release.
Posted by ro...@apache.org.
[BEAM-2964] Exclude incompatible six release.
Upstream bugs being tracked at https://github.com/google/apitools/issues/175 and https://github.com/benjaminp/six/issues/210
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/b3a5b67b
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/b3a5b67b
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/b3a5b67b
Branch: refs/heads/master
Commit: b3a5b67b25de7e98292d86484aaca1c978952ff0
Parents: c25bead
Author: Robert Bradshaw <ro...@gmail.com>
Authored: Tue Sep 19 10:41:43 2017 -0700
Committer: Robert Bradshaw <ro...@gmail.com>
Committed: Tue Sep 19 10:57:08 2017 -0700
----------------------------------------------------------------------
sdks/python/setup.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/b3a5b67b/sdks/python/setup.py
----------------------------------------------------------------------
diff --git a/sdks/python/setup.py b/sdks/python/setup.py
index c13da8e..2bc2e99 100644
--- a/sdks/python/setup.py
+++ b/sdks/python/setup.py
@@ -114,7 +114,9 @@ REQUIRED_SETUP_PACKAGES = [
REQUIRED_TEST_PACKAGES = [
'pyhamcrest>=1.9,<2.0',
# Six required by nose plugins management.
- 'six>=1.9',
+ # Six 1.11.0 incompatible with apitools.
+ # TODO(BEAM-2964): Remove the upper bound.
+ 'six>=1.9,<1.11',
]
GCP_REQUIREMENTS = [