From 7bd1f69f888f2be70e275c8e452d603b524efa0e Mon Sep 17 00:00:00 2001 From: Oleksandr <0init0@gmail.com> Date: Thu, 17 Jun 2021 15:10:18 +0300 Subject: [PATCH 1/2] fix: Prevent unrelated packages from being installed Currently, packages `tests` and `docs` are installed (because they are discovered as valid packages by `PEP420PackageFinder`), which can break user's code if they also use `test` as a location for their tests, due to package name conflict. --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 66a69a7..2c4bdcf 100644 --- a/setup.py +++ b/setup.py @@ -27,6 +27,8 @@ with io.open(readme_filename, encoding="utf-8") as readme_file: readme = readme_file.read() +packages = [package for package in setuptools.PEP420PackageFinder.find() if package.startswith('google')] + setuptools.setup( name="google-cloud-workflows", version=version, @@ -35,7 +37,7 @@ author_email="googleapis-packages@google.com", license="Apache 2.0", url="https://github.com/googleapis/python-workflows", - packages=setuptools.PEP420PackageFinder.find(), + packages=packages, namespace_packages=("google", "google.cloud"), platforms="Posix; MacOS X; Windows", include_package_data=True, From 0e39c6cbadee43e095bd64bea70e34c80a5bbb3b Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Thu, 17 Jun 2021 14:57:47 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2c4bdcf..89ce943 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,11 @@ with io.open(readme_filename, encoding="utf-8") as readme_file: readme = readme_file.read() -packages = [package for package in setuptools.PEP420PackageFinder.find() if package.startswith('google')] +packages = [ + package + for package in setuptools.PEP420PackageFinder.find() + if package.startswith("google") +] setuptools.setup( name="google-cloud-workflows",