diff options
author | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-08-13 21:05:19 +0000 |
---|---|---|
committer | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-08-13 21:05:19 +0000 |
commit | b70e586603c9e584bfb03bc31f6c298394197db6 (patch) | |
tree | 2e4f3a963a6ddd2b5b60aa06876e3e457b9102fb /python/setup.py | |
parent | 7580a8929f9505bd52125d523729da4b1672a493 (diff) | |
download | protobuf-b70e586603c9e584bfb03bc31f6c298394197db6.tar.gz protobuf-b70e586603c9e584bfb03bc31f6c298394197db6.tar.bz2 protobuf-b70e586603c9e584bfb03bc31f6c298394197db6.zip |
put python cpp tests into pyext/
Diffstat (limited to 'python/setup.py')
-rwxr-xr-x | python/setup.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/python/setup.py b/python/setup.py index db3a32e9..51b27d72 100755 --- a/python/setup.py +++ b/python/setup.py @@ -122,12 +122,10 @@ class build_py(_build_py): if __name__ == '__main__': # C++ implementation extension - nocpp = '--nocpp_implementation' - if nocpp in sys.argv: - ext_module_list = [] - sys.argv.remove(nocpp) - else: - nocpp = False + cpp_impl = '--cpp_implementation' + if cpp_impl in sys.argv: + sys.argv.remove(cpp_impl) + test_dir = "google/protobuf/pyext" ext_module_list = [Extension( "google.protobuf.pyext._message", [ "google/protobuf/pyext/descriptor.cc", @@ -140,12 +138,16 @@ if __name__ == '__main__': libraries = [ "protobuf" ], library_dirs = [ '../src/.libs' ], )] + else: + test_dir = "google/protobuf/internal" + ext_module_list = [] + setup(name = 'protobuf', version = '2.6-pre', packages = [ 'google' ], namespace_packages = [ 'google' ], - google_test_dir = "google/protobuf/internal", + google_test_dir = test_dir, # Must list modules explicitly so that we don't install tests. py_modules = [ 'google.protobuf.internal.api_implementation', @@ -182,5 +184,4 @@ if __name__ == '__main__': description = 'Protocol Buffers', long_description = "Protocol Buffers are Google's data interchange format.", - use_2to3=True, ) |