Don't introduce the new griffelib namespace

Author: johnslavik

config/ruff.toml

@@ -35,7 +35,7 @@ ignore = [
     "TRY003",  # Avoid specifying long messages outside the exception class
 ]
 
-logger-objects = ["griffe.logger", "griffelib.logger"]
+logger-objects = ["griffe.logger", "griffe.logger"]
 
 [lint.per-file-ignores]
 "packages/griffecli/src/griffecli/__main__.py" = [
@@ -44,18 +44,18 @@ logger-objects = ["griffe.logger", "griffelib.logger"]
 "packages/griffecli/src/griffecli/_internal/cli.py" = [
     "T201",  # Print statement
 ]
-"packages/griffelib/src/griffelib/_internal/git.py" = [
+"packages/griffelib/src/griffe/_internal/git.py" = [
     "S603",  # `subprocess` call: check for execution of untrusted input
     "S607",  # Starting a process with a partial executable path
 ]
-"packages/griffelib/src/griffelib/_internal/agents/nodes/*.py" = [
+"packages/griffelib/src/griffe/_internal/agents/nodes/*.py" = [
     "ARG001",  # Unused function argument
     "N812",  # Lowercase `keyword` imported as non-lowercase `NodeKeyword`
 ]
-"packages/griffelib/src/griffelib/_internal/debug.py" = [
+"packages/griffelib/src/griffe/_internal/debug.py" = [
     "T201",  # Print statement
 ]
-"packages/griffelib/src/griffelib/_internal/**.py" = [
+"packages/griffelib/src/griffe/_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", "griffelib", "griffecli"]
+known-first-party = ["griffe", "griffecli"]
 
 [lint.pydocstyle]
 convention = "google"

docs/extensions/official/runtime-objects.md

@@ -15,7 +15,7 @@ This extension stores runtime objects corresponding to each loaded Griffe object
 >>> griffe_data["parse"].extra
 defaultdict(<class 'dict'>, {'runtime-objects': {'object': <function parse at 0x78685c951260>}})
 >>> griffe_data["Module"].extra
-defaultdict(<class 'dict'>, {'runtime-objects': {'object': <class 'griffelib._internal.models.Module'>}})
+defaultdict(<class 'dict'>, {'runtime-objects': {'object': <class 'griffe._internal.models.Module'>}})
 ```
 
 It can be useful in combination with mkdocstrings-python and custom templates, to iterate over object values or their attributes that couldn't be loaded by Griffe itself (for example, objects built dynamically and loaded as attributes won't have "members" to iterate over).

docs/guide/contributors/architecture.md

@@ -23,7 +23,7 @@ descriptions = {
     "site": "Documentation site, built with `make run mkdocs build` (git-ignored).",
     "src": "The source of our Python package(s). See [Sources](#sources) and [Program structure](#program-structure).",
     "src/griffe": "Our public API, exposed to users. See [Program structure](#program-structure).",
-    "packages/griffelib/src/griffelib/_internal": "Our internal API, hidden from users. See [Program structure](#program-structure).",
+    "packages/griffelib/src/griffe/_internal": "Our internal API, hidden from users. See [Program structure](#program-structure).",
     "tests": "Our test suite. See [Tests](#tests).",
     ".copier-answers.yml": "The answers file generated by [Copier](https://copier.readthedocs.io/en/stable/). See [Boilerplate](#boilerplate).",
     "devdeps.txt": "Our development dependencies specification. See [`make setup`][command-setup] command.",
@@ -104,11 +104,11 @@ Sources are located in the `src` folder, following the [src-layout](https://pack
 
 Our test suite is located in the `tests` folder. It is located outside of the sources as to not pollute distributions (it would be very wrong to publish a `tests` package as part of our distributions, since this name is extremely common), or worse, the public API. The `tests` folder is however included in our source distributions (`.tar.gz`), alongside most of our metadata and configuration files. Check out `pyproject.toml` to get the full list of files included in our source distributions.
 
-The test suite is based on [pytest](https://docs.pytest.org/en/8.2.x/). Test modules reflect our internal API structure, and except for a few test modules that test specific aspects of our API, each test module tests the logic from the corresponding module in the internal API. For example, `test_finder.py` tests code of the `griffelib._internal.finder` internal module, while `test_functions` tests our ability to extract correct information from function signatures, statically. The general rule of thumb when writing new tests is to mirror the internal API. If a test touches to many aspects of the loading process, it can be added to the `test_loader` test module.
+The test suite is based on [pytest](https://docs.pytest.org/en/8.2.x/). Test modules reflect our internal API structure, and except for a few test modules that test specific aspects of our API, each test module tests the logic from the corresponding module in the internal API. For example, `test_finder.py` tests code of the `griffe._internal.finder` internal module, while `test_functions` tests our ability to extract correct information from function signatures, statically. The general rule of thumb when writing new tests is to mirror the internal API. If a test touches to many aspects of the loading process, it can be added to the `test_loader` test module.
 
 ## Program structure
 
-The internal API is contained within the `packages/griffelib/src/griffelib/_internal` folder. The top-level `griffe/__init__.py` module exposes all the public API, by importing the internal objects from `griffelib`, which itself imports from various submodules of `griffelib._internal`.
+The internal API is contained within the `packages/griffelib/src/griffe/_internal` folder. The top-level `griffe/__init__.py` module exposes all the public API, by importing the internal objects from various submodules of `griffe._internal`.
 
 Users then import `griffe` directly, or import objects from it.
 
@@ -122,7 +122,7 @@ if os.getenv("DEPLOY") == "true":
     from pydeps.target import Target
 
     cli.verbose = cli._not_verbose
-    options = cli.parse_args(["packages/griffelib/src/griffelib", "--noshow", "--reverse"])
+    options = cli.parse_args(["packages/griffelib/src/griffe", "--noshow", "--reverse"])
     colors.START_COLOR = 128
     target = Target(options["fname"])
     with target.chdir_work():

docs/guide/users/loading.md

@@ -214,10 +214,10 @@ from package1 import X
 False
 >>> package2["X"].target
 Traceback (most recent call last):
-  File "griffelib/_internal/models.py", line 1375, in _resolve_target
+  File "griffe/_internal/models.py", line 1375, in _resolve_target
     resolved = self.modules_collection.get_member(self.target_path)
                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  File "griffelib/_internal/mixins.py", line 84, in get_member
+  File "griffe/_internal/mixins.py", line 84, in get_member
     return self.members[parts[0]].get_member(parts[1:])  # type: ignore[attr-defined]
            ~~~~~~~~~~~~^^^^^^^^^^
 KeyError: 'package1'
@@ -226,13 +226,13 @@ The above exception was the direct cause of the following exception:
 
 Traceback (most recent call last):
   File "<stdin>", line 1, in <module>
-  File "griffelib/_internal/dataclasses.py", line 1310, in target
+  File "griffe/_internal/dataclasses.py", line 1310, in target
     self.resolve_target()
-  File "griffelib/_internal/dataclasses.py", line 1369, in resolve_target
+  File "griffe/_internal/dataclasses.py", line 1369, in resolve_target
     self._resolve_target()
-  File "griffelib/_internal/dataclasses.py", line 1377, in _resolve_target
+  File "griffe/_internal/dataclasses.py", line 1377, in _resolve_target
     raise AliasResolutionError(self) from error
-griffelib._internal.exceptions.AliasResolutionError: Could not resolve alias package2.X pointing at package1.X (in package2/__init__.py:1)
+griffe._internal.exceptions.AliasResolutionError: Could not resolve alias package2.X pointing at package1.X (in package2/__init__.py:1)
 ```
 
 As you can see in the interpreter session above, Griffe did not resolve the `X` alias. When we tried to access its target object anyway, it failed with a `KeyError`, which was raised again as an [`AliasResolutionError`][griffe.AliasResolutionError].
@@ -250,7 +250,7 @@ False  # Hmm?
 >>> package2["X"].target
 Traceback (most recent call last):
 ...
-griffelib._internal.exceptions.AliasResolutionError: Could not resolve alias package2.X pointing at package1.X (in package2/__init__.py:1)
+griffe._internal.exceptions.AliasResolutionError: Could not resolve alias package2.X pointing at package1.X (in package2/__init__.py:1)
 ```
 
 The same exception again? What happened here? We loaded both packages, but Griffe still failed to resolve the alias. That is expected; here is the explanation.

docs/guide/users/navigating.md

@@ -14,17 +14,17 @@ When [loading an object](loading.md), Griffe will give you back an instance of o
 ```python
 >>> import griffe
 >>> type(griffe.load("markdown"))
-<class 'griffelib._internal.models.Module'>
+<class 'griffe._internal.models.Module'>
 >>> type(griffe.load("markdown.core.Markdown"))
-<class 'griffelib._internal.models.Class'>
+<class 'griffe._internal.models.Class'>
 >>> type(griffe.load("markdown.Markdown"))
-<class 'griffelib._internal.models.Alias'>
+<class 'griffe._internal.models.Alias'>
 >>> type(griffe.load("markdown.core.markdown"))
-<class 'griffelib._internal.models.Function'>
+<class 'griffe._internal.models.Function'>
 >>> type(griffe.load("markdown.markdown"))
-<class 'griffelib._internal.models.Alias'>
+<class 'griffe._internal.models.Alias'>
 >>> type(griffe.load("markdown.Markdown.references"))
-<class 'griffelib._internal.models.Attribute'>
+<class 'griffe._internal.models.Attribute'>
 ```
 
 However deep the object is, Griffe loads the entire package. It means that in all the cases above, Griffe loaded the whole `markdown` package. The model instance Griffe gives you back is therefore part of a tree that you can navigate.
@@ -41,7 +41,7 @@ To access an object's members, there are a few options:
 
     ```pycon
     >>> import griffe
-    >>> markdown = griffelib.load("markdown")
+    >>> markdown = griffe.load("markdown")
     >>> markdown.members["Markdown"]
     Alias('Markdown', 'markdown.core.Markdown')
     >>> markdown.members["core"].members["Markdown"]
@@ -54,7 +54,7 @@ To access an object's members, there are a few options:
 
     ```pycon
     >>> import griffe
-    >>> markdown = griffelib.load("markdown")
+    >>> markdown = griffe.load("markdown")
     >>> markdown["core"]["Markdown"]  # chained access
     Class('Markdown', 46, 451)
     >>> markdown["core.Markdown"]  # merged access
@@ -65,7 +65,7 @@ To access an object's members, there are a few options:
 
     ```pycon
     >>> import griffe
-    >>> markdown = griffelib.load("markdown")
+    >>> markdown = griffe.load("markdown")
     >>> markdown[("core", "Markdown")]  # tuple access
     Class('Markdown', 46, 451)
     >>> # Due to the nature of the subscript syntax,
@@ -78,7 +78,7 @@ To access an object's members, there are a few options:
 
     ```pycon
     >>> import griffe
-    >>> markdown = griffelib.load("markdown")
+    >>> markdown = griffe.load("markdown")
     >>> markdown.get_member("core.Markdown")
     Class('Markdown', 46, 451)
     ```
@@ -122,7 +122,7 @@ If a base class cannot be resolved during computation of inherited members, Grif
 
 If you want to access all members at once (both declared and inherited), use the [`all_members`][griffe.Object.all_members] attribute. If you want to access only declared members, use the [`members`][griffe.Object] attribute.
 
-Accessing the [`attributes`][griffe.Object.attributes], [`functions`][griffe.Object.functions], [`classes`][griffe.Object.classes], [`type_aliases`][griffe.Object.type_aliases] or [`modules`][griffe.Object.modules] attributes will trigger inheritance computation, so make sure to only access them once everything is loaded by griffelib. Don't try to access inherited members in extensions, while visiting or inspecting modules.
+Accessing the [`attributes`][griffe.Object.attributes], [`functions`][griffe.Object.functions], [`classes`][griffe.Object.classes], [`type_aliases`][griffe.Object.type_aliases] or [`modules`][griffe.Object.modules] attributes will trigger inheritance computation, so make sure to only access them once everything is loaded by griffe. Don't try to access inherited members in extensions, while visiting or inspecting modules.
 
 #### Limitations
 
@@ -254,7 +254,7 @@ from pkg2 import A as B
 
 ```pycon
 >>> import griffe
->>> B = griffelib.load("pkg1.B")
+>>> B = griffe.load("pkg1.B")
 >>> B.path
 'pkg1.B'
 >>> B.canonical_path
@@ -339,13 +339,13 @@ Each object has an optional [`docstring`][griffe.Object.docstring] attached to i
 
 Docstrings can be parsed against several [docstring-styles](../../reference/docstrings.md), which are micro-formats that allow documenting things such as parameters, returned values, raised exceptions, etc..
 
-When loading a package, it is possible to specify the docstring style to attach to every docstring (see the `docstring_parser` parameter of [`griffelib.load`][griffe.load]). Accessing the [`parsed`][griffe.Docstring.parsed] field of a docstring will use this style to parse the docstring and return a list of [docstring sections][advanced-api-sections]. Each section has a `value` whose shape depends on the section kind. For example, parameter sections have a list of parameter representations as value, while a text section only has a string as value.
+When loading a package, it is possible to specify the docstring style to attach to every docstring (see the `docstring_parser` parameter of [`griffe.load`][griffe.load]). Accessing the [`parsed`][griffe.Docstring.parsed] field of a docstring will use this style to parse the docstring and return a list of [docstring sections][advanced-api-sections]. Each section has a `value` whose shape depends on the section kind. For example, parameter sections have a list of parameter representations as value, while a text section only has a string as value.
 
 After a package is loaded, it is still possible to change the style used for specific docstrings by either overriding their [`parser`][griffe.Docstring.parser] and [`parser_options`][griffe.Docstring.parser_options] attributes, or by calling their [`parse()`][griffe.Docstring.parse] method with a different style:
 
 ```pycon
 >>> import griffe
->>> markdown = griffelib.load("markdown", docstring_parser="google")
+>>> markdown = griffe.load("markdown", docstring_parser="google")
 >>> markdown["Markdown"].docstring.parse("numpy")
 [...]
 ```

docs/introduction.md

@@ -22,10 +22,10 @@ Both commands accept a `-h`, `--help` argument to show all the available options
 
 ## Python library
 
-As a library, Griffe exposes all its public API directly in the top-level module. It means you can simply import `griffe` or `griffelib` to access all its API.
+As a library, Griffe exposes all its public API directly in the top-level module. It means you can simply import `griffe` to access all its API.
 
 ```python
-import griffe  # or griffelib
+import griffe
 
 griffe.load(...)
 griffe.find_breaking_changes(...)

docs/reference/api/agents.md

@@ -4,7 +4,7 @@ Griffe is able to analyze code both statically and dynamically.
 
 ## **Main API**
 
-::: griffelib.visit
+::: griffe.visit
 
 ::: griffe.inspect
 

docs/reference/api/expressions.md

@@ -1,6 +1,6 @@
 # Expressions
 
-::: griffelib._internal.expressions
+::: griffe._internal.expressions
     options:
         members: false
         show_root_heading: false

docs/reference/api/loaders.md

@@ -2,22 +2,22 @@
 
 ## **Main API**
 
-::: griffelib.load
+::: griffe.load
 
-::: griffelib.load_git
+::: griffe.load_git
 
-::: griffelib.load_pypi
+::: griffe.load_pypi
 
 ## **Advanced API**
 
-::: griffelib.GriffeLoader
+::: griffe.GriffeLoader
 
-::: griffelib.ModulesCollection
+::: griffe.ModulesCollection
 
-::: griffelib.LinesCollection
+::: griffe.LinesCollection
 
 ## **Additional API**
 
-::: griffelib.Stats
+::: griffe.Stats
 
-::: griffelib.merge_stubs
+::: griffe.merge_stubs

duties.py

@@ -285,7 +285,7 @@ def check_api(ctx: Context, *cli_args: str) -> None:
         *cli_args: Additional Griffe CLI arguments.
     """
     ctx.run(
-        tools.griffecli.check(
+        tools.griffe.check(
             "griffe",
             search=["src"],
             color=True,