diff options
| author | Tres Seaver <tseaver@palladion.com> | 2015-01-13 14:56:00 -0500 |
|---|---|---|
| committer | Tres Seaver <tseaver@palladion.com> | 2015-01-13 14:56:00 -0500 |
| commit | 9821016cfa01102971d91207f042a2d39c4ba23b (patch) | |
| tree | d0c76a2fbc8ca26340c44b95ba5c214ce8745954 /python/setup.py | |
| parent | f336d4b7a5c1d369ed508e513d482c885705e939 (diff) | |
| parent | 7ee25830c6707540242f441df5cd1c2a2000ca58 (diff) | |
| download | protobuf-9821016cfa01102971d91207f042a2d39c4ba23b.tar.gz protobuf-9821016cfa01102971d91207f042a2d39c4ba23b.tar.bz2 protobuf-9821016cfa01102971d91207f042a2d39c4ba23b.zip | |
Merge branch 'drop-apputils-dependency' into straddle_py2_py3
Conflicts:
python/google/protobuf/internal/message_factory_test.py
python/google/protobuf/internal/reflection_test.py
python/google/protobuf/internal/text_format_test.py
Diffstat (limited to 'python/setup.py')
| -rwxr-xr-x | python/setup.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/python/setup.py b/python/setup.py index cfe25cc0..cb75b06e 100755 --- a/python/setup.py +++ b/python/setup.py @@ -197,11 +197,6 @@ if __name__ == '__main__': 'google.protobuf.text_format'], cmdclass = { 'clean': clean, 'build_py': build_py }, install_requires = ['setuptools'], - # TODO: Restore dependency once a Python 3 compatible google-apputils - # is released. - setup_requires = (['google-apputils'] - if sys.version_info[0] < 3 else - []), ext_modules = ext_module_list, url = 'https://developers.google.com/protocol-buffers/', maintainer = maintainer_email, |