aboutsummaryrefslogtreecommitdiff
path: root/python/setup.py
diff options
context:
space:
mode:
authorstone4774 <25053818+stone4774@users.noreply.github.com>2018-03-22 11:16:34 +0800
committerGitHub <noreply@github.com>2018-03-22 11:16:34 +0800
commitc99f5278eb8dad6f42def88ce8b5a3453f6df4a8 (patch)
treec3cd284ec9d2981f61da266d040935b73275b5c4 /python/setup.py
parentd053271deebe0efcd41729991b1f3d618b638ad5 (diff)
parented4321d1cb33199984118d801956822842771e7e (diff)
downloadprotobuf-c99f5278eb8dad6f42def88ce8b5a3453f6df4a8.tar.gz
protobuf-c99f5278eb8dad6f42def88ce8b5a3453f6df4a8.tar.bz2
protobuf-c99f5278eb8dad6f42def88ce8b5a3453f6df4a8.zip
Merge branch 'master' into fixbug_enum2json2
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 0f7e58b0..6f5315f7 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -107,6 +107,7 @@ def GenerateUnittestProtos():
generate_proto("google/protobuf/internal/more_extensions.proto", False)
generate_proto("google/protobuf/internal/more_extensions_dynamic.proto", False)
generate_proto("google/protobuf/internal/more_messages.proto", False)
+ generate_proto("google/protobuf/internal/no_package.proto", False)
generate_proto("google/protobuf/internal/packed_field_test.proto", False)
generate_proto("google/protobuf/internal/test_bad_identifiers.proto", False)
generate_proto("google/protobuf/pyext/python.proto", False)