Skip to content

Commit ef2094a

Browse files
authored
feat: Introduce compatibility with native namespace packages (#1852)
1 parent 8ede788 commit ef2094a

File tree

6 files changed

+6
-12
lines changed

6 files changed

+6
-12
lines changed

gapic/templates/setup.py.j2

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ with io.open(readme_filename, encoding="utf-8") as readme_file:
5151

5252
packages = [
5353
package
54-
for package in setuptools.PEP420PackageFinder.find()
54+
for package in setuptools.find_namespace_packages()
5555
if package.startswith("{{ api.naming.namespace_packages|first }}")
5656
]
5757

@@ -83,7 +83,6 @@ setuptools.setup(
8383
platforms="Posix; MacOS X; Windows",
8484
packages=packages,
8585
python_requires=">=3.7",
86-
namespace_packages=namespaces,
8786
install_requires=dependencies,
8887
include_package_data=True,
8988
zip_safe=False,

tests/integration/goldens/asset/setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

5555
packages = [
5656
package
57-
for package in setuptools.PEP420PackageFinder.find()
57+
for package in setuptools.find_namespace_packages()
5858
if package.startswith("google")
5959
]
6060

@@ -86,7 +86,6 @@
8686
platforms="Posix; MacOS X; Windows",
8787
packages=packages,
8888
python_requires=">=3.7",
89-
namespace_packages=namespaces,
9089
install_requires=dependencies,
9190
include_package_data=True,
9291
zip_safe=False,

tests/integration/goldens/credentials/setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
packages = [
5353
package
54-
for package in setuptools.PEP420PackageFinder.find()
54+
for package in setuptools.find_namespace_packages()
5555
if package.startswith("google")
5656
]
5757

@@ -83,7 +83,6 @@
8383
platforms="Posix; MacOS X; Windows",
8484
packages=packages,
8585
python_requires=">=3.7",
86-
namespace_packages=namespaces,
8786
install_requires=dependencies,
8887
include_package_data=True,
8988
zip_safe=False,

tests/integration/goldens/eventarc/setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252

5353
packages = [
5454
package
55-
for package in setuptools.PEP420PackageFinder.find()
55+
for package in setuptools.find_namespace_packages()
5656
if package.startswith("google")
5757
]
5858

@@ -84,7 +84,6 @@
8484
platforms="Posix; MacOS X; Windows",
8585
packages=packages,
8686
python_requires=">=3.7",
87-
namespace_packages=namespaces,
8887
install_requires=dependencies,
8988
include_package_data=True,
9089
zip_safe=False,

tests/integration/goldens/logging/setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
packages = [
5353
package
54-
for package in setuptools.PEP420PackageFinder.find()
54+
for package in setuptools.find_namespace_packages()
5555
if package.startswith("google")
5656
]
5757

@@ -83,7 +83,6 @@
8383
platforms="Posix; MacOS X; Windows",
8484
packages=packages,
8585
python_requires=">=3.7",
86-
namespace_packages=namespaces,
8786
install_requires=dependencies,
8887
include_package_data=True,
8988
zip_safe=False,

tests/integration/goldens/redis/setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
packages = [
5353
package
54-
for package in setuptools.PEP420PackageFinder.find()
54+
for package in setuptools.find_namespace_packages()
5555
if package.startswith("google")
5656
]
5757

@@ -83,7 +83,6 @@
8383
platforms="Posix; MacOS X; Windows",
8484
packages=packages,
8585
python_requires=">=3.7",
86-
namespace_packages=namespaces,
8786
install_requires=dependencies,
8887
include_package_data=True,
8988
zip_safe=False,

0 commit comments

Comments
 (0)