Skip to content

Commit

Permalink
feat: Introduce compatibility with native namespace packages
Browse files Browse the repository at this point in the history
  • Loading branch information
parthea committed Nov 13, 2023
1 parent 58b3152 commit 695affd
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 66 deletions.
5 changes: 0 additions & 5 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,3 @@ exclude_lines =
pragma: NO COVER
# Ignore debug-only repr
def __repr__
# Ignore pkg_resources exceptions.
# This is added at the module level as a safeguard for if someone
# generates the code and tries to run it without pip installing. This
# makes it virtually impossible to test properly.
except pkg_resources.DistributionNotFound
24 changes: 0 additions & 24 deletions google/__init__.py

This file was deleted.

24 changes: 0 additions & 24 deletions google/cloud/__init__.py

This file was deleted.

5 changes: 4 additions & 1 deletion google/cloud/bigquery/magics/magics.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,10 @@
from google.cloud.bigquery.magics import line_arg_parser as lap


IPYTHON_USER_AGENT = "ipython-{}".format(IPython.__version__)
# Add `# type: ignore` to silence mypy error `Cannot determine type of "__version__" [has-type]`
# The IPython source file below does not have type hints.
# https://github.com/ipython/ipython/blob/86d44b7f4674d5bf830afea5e6235c28a4b56bfd/IPython/__init__.py#L65
IPYTHON_USER_AGENT = "ipython-{}".format(IPython.__version__) # type: ignore


class Context(object):
Expand Down
2 changes: 1 addition & 1 deletion noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ def mypy(session):
"types-requests",
"types-setuptools",
)
session.run("mypy", "google/cloud", "--show-traceback")
session.run("mypy", "-p", "google", "--show-traceback")


@nox.session(python=DEFAULT_PYTHON_VERSION)
Expand Down
7 changes: 5 additions & 2 deletions samples/magics/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import pytest

if typing.TYPE_CHECKING:
from IPython.core.interactiveshell import TerminalInteractiveShell
from IPython.terminal.interactiveshell import TerminalInteractiveShell

interactiveshell = pytest.importorskip("IPython.terminal.interactiveshell")
tools = pytest.importorskip("IPython.testing.tools")
Expand All @@ -40,5 +40,8 @@ def ipython_interactive(
for the duration of the test scope.
"""
with ipython.builtin_trap:
# Remove ` # type: ignore` once
# https://github.com/ipython/ipython/issues/14181 is fixed.
# Also see https://github.com/ipython/ipython/blob/86d44b7f4674d5bf830afea5e6235c28a4b56bfd/IPython/core/interactiveshell.py#L1838.
with ipython.builtin_trap: # type: ignore
yield ipython
5 changes: 4 additions & 1 deletion samples/snippets/jupyter_tutorial_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@ def ipython_interactive(
for the duration of the test scope.
"""
with ipython.builtin_trap:
# Remove `# type: ignore` once
# https://github.com/ipython/ipython/issues/14181 is fixed.
# Also see https://github.com/ipython/ipython/blob/86d44b7f4674d5bf830afea5e6235c28a4b56bfd/IPython/core/interactiveshell.py#L1838.
with ipython.builtin_trap: # type: ignore
yield ipython


Expand Down
9 changes: 1 addition & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,10 @@
# benchmarks, etc.
packages = [
package
for package in setuptools.PEP420PackageFinder.find()
for package in setuptools.find_namespace_packages()
if package.startswith("google")
]

# Determine which namespaces are needed.
namespaces = ["google"]
if "google.cloud" in packages:
namespaces.append("google.cloud")


setuptools.setup(
name=name,
version=version,
Expand All @@ -143,7 +137,6 @@
],
platforms="Posix; MacOS X; Windows",
packages=packages,
namespace_packages=namespaces,
install_requires=dependencies,
extras_require=extras,
python_requires=">=3.7",
Expand Down

0 comments on commit 695affd

Please sign in to comment.