organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge branch 'prep_for_py2_py3_straddle' into straddle_py2_py3

Browse source 
Conflicts:
	python/setup.py
This commit is contained in:
Tres Seaver 2015-01-13 14:58:38 -05:00
commit 70dcdeb62c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
python/setup.py
View file

@ -196,7 +196,7 @@ if __name__ == '__main__':
'google.protobuf.text_encoding',
'google.protobuf.text_format'],
cmdclass = { 'clean': clean, 'build_py': build_py },
install_requires = ['setuptools'],
install_requires = ['setuptools', 'six'],
ext_modules = ext_module_list,
url = 'https://developers.google.com/protocol-buffers/',
maintainer = maintainer_email,