Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: migrate to native namespace packages #187

Merged
merged 7 commits into from
Nov 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file removed google/api/__init__.py
Empty file.
Empty file.
24 changes: 0 additions & 24 deletions google/logging/__init__.py

This file was deleted.

Empty file removed google/logging/type/__init__.py
Empty file.
Empty file removed google/longrunning/__init__.py
Empty file.
24 changes: 0 additions & 24 deletions google/rpc/__init__.py

This file was deleted.

Empty file removed google/rpc/context/__init__.py
Empty file.
Empty file removed google/type/__init__.py
Empty file.
10 changes: 2 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import os

import setuptools
from setuptools import find_namespace_packages


name = "googleapis-common-protos"
Expand All @@ -36,12 +37,6 @@
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=name,
version=version,
Expand All @@ -66,10 +61,9 @@
install_requires=dependencies,
extras_require=extras_require,
license="Apache-2.0",
packages=packages,
package_data={"": ["*.proto"]},
python_requires=">=3.7",
namespace_packages=["google", "google.logging"],
packages=find_namespace_packages(exclude=("tests*", "testing*")),
url="https://github.com/googleapis/python-api-common-protos",
include_package_data=True,
)
52 changes: 52 additions & 0 deletions tests/unit/test_packaging.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# 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 ``googleapis-common-protos``.
"""
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.cloud`` namespace package should not be masked
by the presence of ``googleapis-common-protos``.
"""
google_cloud = tmp_path / "google/cloud"
google_cloud.mkdir()
google_cloud.joinpath("othermod.py").write_text("")
env = dict(os.environ, PYTHONPATH=str(tmp_path))
cmd = [sys.executable, "-m", "google.cloud.othermod"]
subprocess.check_call(cmd, env=env)

"""
The ``google.logging`` namespace package should not be masked
by the presence of ``googleapis-common-protos``.
"""
google_logging = tmp_path / "google/logging"
google_logging.mkdir()
google_logging.joinpath("othermod.py").write_text("")
env = dict(os.environ, PYTHONPATH=str(tmp_path))
cmd = [sys.executable, "-m", "google.logging.othermod"]
subprocess.check_call(cmd, env=env)