Fix test imports and paths for new package structure

Co-authored-by: johnslavik <64036239+johnslavik@users.noreply.github.com>

Author: Copilot

config/ruff.toml

@@ -35,27 +35,27 @@ ignore = [
     "TRY003",  # Avoid specifying long messages outside the exception class
 ]
 
-logger-objects = ["griffelib.logger"]
+logger-objects = ["griffe.logger", "griffelib.logger"]
 
 [lint.per-file-ignores]
-"packages/griffe/src/griffe/__main__.py" = [
+"packages/griffecli/src/griffecli/__main__.py" = [
     "D100",  # Missing module docstring
 ]
-"packages/griffe/src/griffe/_internal/cli.py" = [
+"packages/griffecli/src/griffecli/_internal/cli.py" = [
     "T201",  # Print statement
 ]
-"packages/griffe/src/griffe/_internal/git.py" = [
+"packages/griffelib/src/griffelib/_internal/git.py" = [
     "S603",  # `subprocess` call: check for execution of untrusted input
     "S607",  # Starting a process with a partial executable path
 ]
-"packages/griffe/src/griffe/_internal/agents/nodes/*.py" = [
+"packages/griffelib/src/griffelib/_internal/agents/nodes/*.py" = [
     "ARG001",  # Unused function argument
     "N812",  # Lowercase `keyword` imported as non-lowercase `NodeKeyword`
 ]
-"packages/griffe/src/griffe/_internal/debug.py" = [
+"packages/griffelib/src/griffelib/_internal/debug.py" = [
     "T201",  # Print statement
 ]
-"packages/griffe/src/griffe/_internal/**.py" = [
+"packages/griffelib/src/griffelib/_internal/**.py" = [
     "D100",  # Missing docstring in public module
 ]
 "scripts/*.py" = [
@@ -84,7 +84,7 @@ docstring-quotes = "double"
 ban-relative-imports = "all"
 
 [lint.isort]
-known-first-party = ["griffe"]
+known-first-party = ["griffe", "griffelib", "griffecli"]
 
 [lint.pydocstyle]
 convention = "google"

packages/griffecli/src/griffecli/_internal/__init__.py

@@ -0,0 +1 @@
+# Internal module for griffecli.

packages/griffelib/src/griffelib/_internal/extensions/base.py

@@ -603,7 +603,7 @@ def load_extensions(*exts: LoadableExtensionType) -> Extensions:
 
     # TODO: Deprecate and remove at some point?
     # Always add our built-in dataclasses extension.
-    from griffelib._internal.extensions.dataclasses import DataclassesExtension # noqa: PLC0415
+    from griffelib._internal.extensions.dataclasses import DataclassesExtension  # noqa: PLC0415
 
     for ext in extensions._extensions:
         if type(ext) is DataclassesExtension:

packages/griffelib/src/griffelib/_internal/models.py

@@ -14,7 +14,12 @@
 from griffelib._internal.c3linear import c3linear_merge
 from griffelib._internal.docstrings.parsers import DocstringOptions, DocstringStyle, parse
 from griffelib._internal.enumerations import Kind, ParameterKind, Parser, TypeParameterKind
-from griffelib._internal.exceptions import AliasResolutionError, BuiltinModuleError, CyclicAliasError, NameResolutionError
+from griffelib._internal.exceptions import (
+    AliasResolutionError,
+    BuiltinModuleError,
+    CyclicAliasError,
+    NameResolutionError,
+)
 from griffelib._internal.expressions import ExprCall, ExprName, ExprTuple
 from griffelib._internal.logger import logger
 from griffelib._internal.mixins import ObjectAliasMixin

src/griffe/__init__.py

@@ -20,9 +20,9 @@
 See the `griffelib` and `griffecli` packages for detailed API documentation.
 """
 
-from griffecli import *
+from griffecli import *  # noqa: F403
 from griffecli import __all__ as __cli_all__
-from griffelib import *
+from griffelib import *  # noqa: F403
 from griffelib import __all__ as __lib_all__
 
-__all__ = [*__lib_all__, *__cli_all__]
+__all__ = [*__lib_all__, *__cli_all__]  # noqa: PLE0604

src/griffe/__main__.py

@@ -1,3 +1,11 @@
+"""Entry-point module, in case you use `python -m griffe`.
+
+Why does this file exist, and why `__main__`? For more info, read:
+
+- https://www.python.org/dev/peps/pep-0338/
+- https://docs.python.org/3/using/cmdline.html#cmdoption-m
+"""
+
 import sys
 
 from griffecli import main

tests/test_cli.py

@@ -6,7 +6,8 @@
 
 import pytest
 
-from griffelib._internal import cli, debug
+from griffecli._internal import cli
+from griffelib._internal import debug
 
 
 def test_main() -> None:

tests/test_encoders.py

@@ -73,7 +73,7 @@ def test_namespace_packages() -> None:
 def test_minimal_light_data_is_enough(symbol: str) -> None:
     """Test serialization and de-serialization."""
     loader = GriffeLoader()
-    package = loader.load("griffe")
+    package = loader.load("griffelib")
     obj = package[symbol]
     dump_options = {"indent": 2, "sort_keys": True}
     minimal = obj.as_json(full=False, **dump_options)

tests/test_finder.py

@@ -125,7 +125,7 @@ def test_editables_file_handling(tmp_path: Path, editable_file_name: str) -> Non
         tmp_path: Pytest fixture.
     """
     pth_file = tmp_path / editable_file_name
-    pth_file.write_text("hello\nF.map_module('griffe', 'packages/griffe/src/griffe/__init__.py')", encoding="utf8")
+    pth_file.write_text("hello\nF.map_module('griffe', 'src/griffe/__init__.py')", encoding="utf8")
     paths = [sp.path for sp in _handle_editable_module(pth_file)]
     assert paths == [Path("src")]
 
@@ -139,7 +139,7 @@ def test_setuptools_file_handling(tmp_path: Path, annotation: str) -> None:
         annotation: The type annotation of the MAPPING variable.
     """
     pth_file = tmp_path / "__editable__whatever.py"
-    pth_file.write_text(f"hello\nMAPPING{annotation} = {{'griffe': 'packages/griffe/src/griffe'}}", encoding="utf8")
+    pth_file.write_text(f"hello\nMAPPING{annotation} = {{'griffe': 'src/griffe'}}", encoding="utf8")
     paths = [sp.path for sp in _handle_editable_module(pth_file)]
     assert paths == [Path("src")]