diff options
| author | Thomas Hisch <t.hisch@gmail.com> | 2018-04-09 21:43:10 +0200 |
|---|---|---|
| committer | Jie Luo <anandolee@gmail.com> | 2018-04-09 12:43:10 -0700 |
| commit | 451e0446abc40f46b5941c3feedb111e920c9959 (patch) | |
| tree | 836e5a8f428cefd6c818404cf659520783eb82f6 | |
| parent | 3b6d027ba250c96ac1c5e3c0a1de0b1570d7bba1 (diff) | |
| download | protobuf-451e0446abc40f46b5941c3feedb111e920c9959.tar.gz protobuf-451e0446abc40f46b5941c3feedb111e920c9959.tar.bz2 protobuf-451e0446abc40f46b5941c3feedb111e920c9959.zip | |
Add __init__.py files to compiler and util subpackages (#4117)
The compiler and util subpackages are created by the build_py class in
setup.py. This has caused an issue in the protobuf package in
conda-forge (https://github.com/conda-forge/protobuf-feedstock/issues/40),
which is fixed by this commit.
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | python/google/protobuf/compiler/__init__.py | 0 | ||||
| -rw-r--r-- | python/google/protobuf/util/__init__.py | 0 | ||||
| -rwxr-xr-x | python/setup.py | 10 |
5 files changed, 3 insertions, 11 deletions
@@ -58,8 +58,6 @@ python/*.egg python/.eggs/ python/.tox python/build/ -python/google/protobuf/compiler/ -python/google/protobuf/util/ src/js_embed src/protoc diff --git a/Makefile.am b/Makefile.am index 23c5cffe..da371c67 100644 --- a/Makefile.am +++ b/Makefile.am @@ -763,6 +763,7 @@ python_EXTRA_DIST= \ python/MANIFEST.in \ python/google/__init__.py \ python/google/protobuf/__init__.py \ + python/google/protobuf/compiler/__init__.py \ python/google/protobuf/descriptor.py \ python/google/protobuf/descriptor_database.py \ python/google/protobuf/descriptor_pool.py \ @@ -858,6 +859,7 @@ python_EXTRA_DIST= \ python/google/protobuf/symbol_database.py \ python/google/protobuf/text_encoding.py \ python/google/protobuf/text_format.py \ + python/google/protobuf/util/__init__.py \ python/release.sh \ python/mox.py \ python/setup.cfg \ diff --git a/python/google/protobuf/compiler/__init__.py b/python/google/protobuf/compiler/__init__.py new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/python/google/protobuf/compiler/__init__.py diff --git a/python/google/protobuf/util/__init__.py b/python/google/protobuf/util/__init__.py new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/python/google/protobuf/util/__init__.py diff --git a/python/setup.py b/python/setup.py index 8f1caec2..bdae6913 100755 --- a/python/setup.py +++ b/python/setup.py @@ -120,9 +120,7 @@ class clean(_clean): for filename in filenames: filepath = os.path.join(dirpath, filename) if filepath.endswith("_pb2.py") or filepath.endswith(".pyc") or \ - filepath.endswith(".so") or filepath.endswith(".o") or \ - filepath.endswith('google/protobuf/compiler/__init__.py') or \ - filepath.endswith('google/protobuf/util/__init__.py'): + filepath.endswith(".so") or filepath.endswith(".o"): os.remove(filepath) # _clean is an old-style class, so super() doesn't work. _clean.run(self) @@ -144,12 +142,6 @@ class build_py(_build_py): generate_proto("../src/google/protobuf/wrappers.proto") GenerateUnittestProtos() - # Make sure google.protobuf/** are valid packages. - for path in ['', 'internal/', 'compiler/', 'pyext/', 'util/']: - try: - open('google/protobuf/%s__init__.py' % path, 'a').close() - except EnvironmentError: - pass # _build_py is an old-style class, so super() doesn't work. _build_py.run(self) |