Skip to content

Commit 1aaee60

Browse files
feat: Introduce compatibility with native namespace packages (#231)
* feat: Introduce compatibility with native namespace packages * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent a565b8e commit 1aaee60

File tree

4 files changed

+40
-52
lines changed

4 files changed

+40
-52
lines changed

google/__init__.py

Lines changed: 0 additions & 22 deletions
This file was deleted.

google/cloud/__init__.py

Lines changed: 0 additions & 22 deletions
This file was deleted.

setup.py

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,11 @@
5454
# Only include packages under the 'google' namespace. Do not include tests,
5555
# benchmarks, etc.
5656
packages = [
57-
package for package in setuptools.find_packages() if package.startswith("google")
57+
package
58+
for package in setuptools.find_namespace_packages()
59+
if package.startswith("google")
5860
]
5961

60-
# Determine which namespaces are needed.
61-
namespaces = ["google"]
62-
if "google.cloud" in packages:
63-
namespaces.append("google.cloud")
64-
65-
6662
setuptools.setup(
6763
name=name,
6864
version=version,
@@ -89,7 +85,6 @@
8985
],
9086
platforms="Posix; MacOS X; Windows",
9187
packages=packages,
92-
namespace_packages=namespaces,
9388
install_requires=dependencies,
9489
extras_require=extras,
9590
python_requires=">=3.7",

tests/unit/test_packaging.py

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Copyright 2023 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
import os
16+
import subprocess
17+
import sys
18+
19+
20+
def test_namespace_package_compat(tmp_path):
21+
# The ``google`` namespace package should not be masked
22+
# by the presence of ``google-cloud-runtimeconfig``.
23+
google = tmp_path / "google"
24+
google.mkdir()
25+
google.joinpath("othermod.py").write_text("")
26+
env = dict(os.environ, PYTHONPATH=str(tmp_path))
27+
cmd = [sys.executable, "-m", "google.othermod"]
28+
subprocess.check_call(cmd, env=env)
29+
30+
# The ``google.cloud`` namespace package should not be masked
31+
# by the presence of ``google-cloud-runtimeconfig``.
32+
google_cloud = tmp_path / "google" / "cloud"
33+
google_cloud.mkdir()
34+
google_cloud.joinpath("othermod.py").write_text("")
35+
env = dict(os.environ, PYTHONPATH=str(tmp_path))
36+
cmd = [sys.executable, "-m", "google.cloud.othermod"]
37+
subprocess.check_call(cmd, env=env)

0 commit comments

Comments
 (0)