diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2015-12-29 14:36:46 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-12-29 14:36:46 -0800 |
| commit | 283c40c8972e0096dd10c9d58685f71e8c19d783 (patch) | |
| tree | 9da43bfc2e25a301c3beb777b46b338caa3fc519 | |
| parent | ef6c72b46b81870f3b7cba9102477959b6ea3e92 (diff) | |
| download | protobuf-283c40c8972e0096dd10c9d58685f71e8c19d783.tar.gz protobuf-283c40c8972e0096dd10c9d58685f71e8c19d783.tar.bz2 protobuf-283c40c8972e0096dd10c9d58685f71e8c19d783.zip | |
Require six>=1.9 for Python.
We use six sub-modules that aren't available in old versions. Not specifying
this requirement in the setup will lead to much less readable runtime errors.
It's particuarlly problematic for Mac OSX users because the system comes with
an old six version 1.4.1 by default.
[skip ci]
| -rwxr-xr-x | python/setup.py | 2 | ||||
| -rw-r--r-- | python/tox.ini | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/python/setup.py b/python/setup.py index 1e71a702..2a5513b7 100755 --- a/python/setup.py +++ b/python/setup.py @@ -183,7 +183,7 @@ if __name__ == '__main__': os.environ['PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION'] = 'cpp' # Keep this list of dependencies in sync with tox.ini. - install_requires = ['six', 'setuptools'] + install_requires = ['six>=1.9', 'setuptools'] if sys.version_info <= (2,7): install_requires.append('ordereddict') install_requires.append('unittest2') diff --git a/python/tox.ini b/python/tox.ini index 3ca39343..301335bd 100644 --- a/python/tox.ini +++ b/python/tox.ini @@ -21,6 +21,6 @@ commands = # cpp: python setup.py -q test_conformance --cpp_implementation deps = # Keep this list of dependencies in sync with setup.py. - six + six>=1.9 py26: ordereddict py26: unittest2 |