diff --git a/packages/google-cloud-access-context-manager/google/__init__.py b/packages/google-cloud-access-context-manager/google/__init__.py deleted file mode 100644 index 9a1b64a6d586..000000000000 --- a/packages/google-cloud-access-context-manager/google/__init__.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright 2020 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -try: - import pkg_resources - - pkg_resources.declare_namespace(__name__) -except ImportError: - import pkgutil - - __path__ = pkgutil.extend_path(__path__, __name__) diff --git a/packages/google-cloud-access-context-manager/google/identity/__init__.py b/packages/google-cloud-access-context-manager/google/identity/__init__.py deleted file mode 100644 index 9a1b64a6d586..000000000000 --- a/packages/google-cloud-access-context-manager/google/identity/__init__.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright 2020 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -try: - import pkg_resources - - pkg_resources.declare_namespace(__name__) -except ImportError: - import pkgutil - - __path__ = pkgutil.extend_path(__path__, __name__) diff --git a/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/__init__.py b/packages/google-cloud-access-context-manager/google/identity/accesscontextmanager/__init__.py deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/packages/google-cloud-access-context-manager/setup.py b/packages/google-cloud-access-context-manager/setup.py index c4c5b55da153..0e3bb0919e65 100644 --- a/packages/google-cloud-access-context-manager/setup.py +++ b/packages/google-cloud-access-context-manager/setup.py @@ -45,10 +45,6 @@ package for package in setuptools.find_packages() if package.startswith("google") ] -# Determine which namespaces are needed. -namespaces = ["google"] -namespaces.append("google.identity") - setuptools.setup( name=name, version=version, @@ -75,7 +71,6 @@ ], platforms="Posix; MacOS X; Windows", packages=packages, - namespace_packages=namespaces, install_requires=dependencies, python_requires=">=3.7", include_package_data=True, diff --git a/packages/google-cloud-access-context-manager/tests/.gitkeep b/packages/google-cloud-access-context-manager/tests/.gitkeep deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/packages/google-cloud-access-context-manager/tests/test_packaging.py b/packages/google-cloud-access-context-manager/tests/test_packaging.py new file mode 100644 index 000000000000..01905d7c9bfb --- /dev/null +++ b/packages/google-cloud-access-context-manager/tests/test_packaging.py @@ -0,0 +1,48 @@ +# Copyright 2023 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import os +import subprocess +import sys + + +def test_namespace_package_compat(tmp_path): + # The ``google`` namespace package should not be masked + # by the presence of ``google-cloud-access-context-manager``. + google = tmp_path / "google" + google.mkdir() + google.joinpath("othermod.py").write_text("") + env = dict(os.environ, PYTHONPATH=str(tmp_path)) + cmd = [sys.executable, "-m", "google.othermod"] + subprocess.check_call(cmd, env=env) + + # The ``google.identity`` namespace package should not be masked + # by the presence of ``google-cloud-access-context-manager``. + google_identity = tmp_path / "google" / "identity" + google_identity.mkdir() + google_identity.joinpath("othermod.py").write_text("") + env = dict(os.environ, PYTHONPATH=str(tmp_path)) + cmd = [sys.executable, "-m", "google.identity.othermod"] + subprocess.check_call(cmd, env=env) + + # The ``google.identity.accesscontextmanager`` namespace package should not be masked + # by the presence of ``google-cloud-access-context-manager``. + google_identity_accesscontextmanager = ( + tmp_path / "google" / "identity" / "accesscontextmanager" + ) + google_identity_accesscontextmanager.mkdir() + google_identity_accesscontextmanager.joinpath("othermod.py").write_text("") + env = dict(os.environ, PYTHONPATH=str(tmp_path)) + cmd = [sys.executable, "-m", "google.identity.accesscontextmanager.othermod"] + subprocess.check_call(cmd, env=env)