diff options
author | Josh Haberman <jhaberman@gmail.com> | 2016-03-29 16:24:35 -0700 |
---|---|---|
committer | Josh Haberman <jhaberman@gmail.com> | 2016-03-29 16:24:35 -0700 |
commit | a15b916c419000565384a78224e402ed925e5fc8 (patch) | |
tree | d0bd6aa4648fddbb08d35d8b78dba32958ae7b51 /python | |
parent | 67c727cd411a339eb4233c84d9a1afadd8c20566 (diff) | |
parent | 261ee021f640ea6fe67aaf1f53e1518ed154cad0 (diff) | |
download | protobuf-a15b916c419000565384a78224e402ed925e5fc8.tar.gz protobuf-a15b916c419000565384a78224e402ed925e5fc8.tar.bz2 protobuf-a15b916c419000565384a78224e402ed925e5fc8.zip |
Merge branch 'master' into docker
Diffstat (limited to 'python')
-rwxr-xr-x | python/google/protobuf/__init__.py | 2 | ||||
-rwxr-xr-x | python/setup.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 5d244191..fcb1734e 100755 --- a/python/google/protobuf/__init__.py +++ b/python/google/protobuf/__init__.py @@ -30,7 +30,7 @@ # Copyright 2007 Google Inc. All Rights Reserved. -__version__ = '3.0.0b2' +__version__ = '3.0.0b2.post2' if __name__ != '__main__': try: diff --git a/python/setup.py b/python/setup.py index 24ac53db..6ea3bad7 100755 --- a/python/setup.py +++ b/python/setup.py @@ -210,6 +210,7 @@ if __name__ == '__main__': "Programming Language :: Python :: 3.3", "Programming Language :: Python :: 3.4", ], + namespace_packages=['google'], packages=find_packages( exclude=[ 'import_test_package', |