diff options
Diffstat (limited to 'python/setup.py')
| -rwxr-xr-x | python/setup.py | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/python/setup.py b/python/setup.py index 61ae8eac..3739dc45 100755 --- a/python/setup.py +++ b/python/setup.py @@ -135,13 +135,6 @@ class build_py(_build_py): pass # _build_py is an old-style class, so super() doesn't work. _build_py.run(self) - # TODO(mrovner): Subclass to run 2to3 on some files only. - # Tracing what https://wiki.python.org/moin/PortingPythonToPy3k's "Approach 2" - # section on how to get 2to3 to run on source files during install under - # Python 3. This class seems like a good place to put logic that calls - # python3's distutils.util.run_2to3 on the subset of the files we have in our - # release that are subject to conversion. - # See code reference in previous code review. if __name__ == '__main__': ext_module_list = [] @@ -184,11 +177,6 @@ if __name__ == '__main__': test_suite = 'setup.MakeTestSuite', google_test_dir = "google/protobuf/internal", 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 - []), + install_requires = ['setuptools', 'six'], ext_modules = ext_module_list, ) |