Skip to content

Commit c8967ef

Browse files
committed
feat: Introduce compatibility with native namespace packages
1 parent 3069ef4 commit c8967ef

File tree

3 files changed

+29
-33
lines changed

3 files changed

+29
-33
lines changed

google/__init__.py

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

setup.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,9 @@
6363
# Only include packages under the 'google' namespace. Do not include tests,
6464
# benchmarks, etc.
6565
packages = [
66-
package for package in setuptools.find_packages() if package.startswith("google")
66+
package for package in setuptools.find_namespace_packages() if package.startswith("google")
6767
]
6868

69-
# Determine which namespaces are needed.
70-
namespaces = ["google"]
71-
if "google.cloud" in packages:
72-
namespaces.append("google.cloud")
73-
74-
7569
setuptools.setup(
7670
name=name,
7771
version=version,
@@ -97,7 +91,6 @@
9791
],
9892
platforms="Posix; MacOS X; Windows",
9993
packages=packages,
100-
namespace_packages=namespaces,
10194
install_requires=dependencies,
10295
extras_require=extras,
10396
python_requires=">=3.7",

tests/unit/test_packaging.py

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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-api-core``.
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)

0 commit comments

Comments
 (0)