aboutsummaryrefslogtreecommitdiff
path: root/python/setup.py
diff options
context:
space:
mode:
authorCraig Citro <craigcitro@google.com>2016-03-04 20:40:24 -0800
committerCraig Citro <craigcitro@google.com>2016-03-05 00:10:11 -0800
commit0e7c0c2fb8bcf1f50dd01f7620c47a268329bde4 (patch)
tree17ac576a4a75f1e38e64c72ffaf8dd35e57f73bc /python/setup.py
parente70f9256af79af6092eae4ce22a61b1b6651f37d (diff)
downloadprotobuf-0e7c0c2fb8bcf1f50dd01f7620c47a268329bde4.tar.gz
protobuf-0e7c0c2fb8bcf1f50dd01f7620c47a268329bde4.tar.bz2
protobuf-0e7c0c2fb8bcf1f50dd01f7620c47a268329bde4.zip
Add back the namespace_packages arg in setup.py.
Improves #1296. The problem: in the previous patch, we tweaked the __init__.py files to use namespaces, but no longer declared ourselves as a namespace package. The second half was unwise. Note that this only comes up when installing protobuf alongside another package that also installs into the google namespace; as of right now, the only PyPI package that does is googleapis-common-protos, though the GAE SDK also uses google.appengine. Installing either or both of those alongside this package now works. The case that still remains is the upgrade path, which is also what worried me in #713. It seems that if protobuf 2.6.1 is installed, there's no way to safely upgrade that to work with a newer protobuf. However, `pip uninstall` && `pip install` does the trick.
Diffstat (limited to 'python/setup.py')
-rwxr-xr-xpython/setup.py1
1 files changed, 1 insertions, 0 deletions
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',