Repository: incubator-beam Updated Branches: refs/heads/python-sdk 68ddb7ecf -> 56ab1a4d5
Fixed pip requirement. Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/2b5061a1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/2b5061a1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/2b5061a1 Branch: refs/heads/python-sdk Commit: 2b5061a139169f86531727f3d20c8ee3581626f1 Parents: 68ddb7e Author: mbuccini <mbucc...@talend.com> Authored: Tue Sep 27 10:30:38 2016 +0200 Committer: Robert Bradshaw <rober...@gmail.com> Committed: Fri Oct 14 12:40:54 2016 -0700 ---------------------------------------------------------------------- sdks/python/README.md | 2 +- sdks/python/setup.py | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/2b5061a1/sdks/python/README.md ---------------------------------------------------------------------- diff --git a/sdks/python/README.md b/sdks/python/README.md index dca9517..e003aab 100644 --- a/sdks/python/README.md +++ b/sdks/python/README.md @@ -118,7 +118,7 @@ set up your machine's Python development environment. #### Install ``pip`` `pip` is Python's package manager. If you already have `pip` installed -(type `pip -V` to check), skip this step. +(type `pip -V` to check), please make sure to have at least version 7.0.0. There are several ways to install `pip`; use whichever works for you. http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/2b5061a1/sdks/python/setup.py ---------------------------------------------------------------------- diff --git a/sdks/python/setup.py b/sdks/python/setup.py index 09ceef9..20870b8 100644 --- a/sdks/python/setup.py +++ b/sdks/python/setup.py @@ -17,9 +17,12 @@ """Apache Beam SDK for Python setup file.""" +from distutils.version import StrictVersion + import os import platform import setuptools +import pkg_resources def get_version(): @@ -40,6 +43,9 @@ PACKAGE_LONG_DESCRIPTION = ''' TBD ''' +_PIP_VERSION = pkg_resources.get_distribution('pip').version +assert StrictVersion(_PIP_VERSION) >= StrictVersion('0.7.0'), \ + "This SDK requires 'pip' >= 7.0.0" # Currently all compiled modules are optional (for performance only). if platform.system() == 'Windows': @@ -65,7 +71,6 @@ REQUIRED_PACKAGES = [ 'pyyaml>=3.10', ] - setuptools.setup( name=PACKAGE_NAME, version=PACKAGE_VERSION,
