derivepassphrase.git

@@ -60,7 +60,10 @@ nav:

         - Overview: reference/tests.test_derivepassphrase_ssh_agent.md

         - Basic tests: reference/tests.test_derivepassphrase_ssh_agent.test_000_basic.md

         - Heavy-duty tests: reference/tests.test_derivepassphrase_ssh_agent.test_heavy_duty.md

-      - _types module: reference/tests.test_derivepassphrase_types.md

+      - _types module:

+        - Overview: reference/tests.test_derivepassphrase_types.md

+        - Basic tests: reference/tests.test_derivepassphrase_types.test_000_basic.md

+        - Heavy-duty tests: reference/tests.test_derivepassphrase_types.test_heavy_duty.md

       - vault module: reference/tests.test_derivepassphrase_vault.md

   - Design & Background:

     - explanation/index.md

@@ -363,8 +363,9 @@ def spawn_named_agent(

     tear down the communication channel and terminate the SSH agent.

     The SSH agent's instructions for setting up the communication

-    channel are parsed with [`tests.parse_sh_export_line`][].  See the

-    caveats there.

+    channel are parsed with

+    [`tests.data.callables.parse_sh_export_line`][].  See the caveats

+    there.

     Args:

         exec_name:

@@ -22,8 +22,8 @@ from typing import TYPE_CHECKING

 import hypothesis

 from hypothesis import strategies

-from tests import data, machinery

 from derivepassphrase import _types

+from tests import data, machinery

 __all__ = ()

@@ -115,17 +115,18 @@ def smudged_vault_test_config(

     Uses [`_types.js_truthiness`][] internally, which is tested

     separately by

-    [`tests.test_derivepassphrase_types.test_100_js_truthiness`][].

+    [`tests.test_derivepassphrase_types.test_heavy_duty.test_js_truthiness`][].

     Args:

         draw:

             The `draw` function, as provided for by hypothesis.

         config:

-            A strategy which generates [`VaultTestConfig`][] objects.

+            A strategy which generates [`data.VaultTestConfig`][]

+            objects.

     Returns:

-        A new [`VaultTestConfig`][] where some falsy values have been

-        replaced or added.

+        A new [`data.VaultTestConfig`][] where some falsy values have

+        been replaced or added.

     """

@@ -15,6 +15,9 @@ from typing_extensions import Any

 from derivepassphrase import _types, cli

 from derivepassphrase._internals import cli_helpers

+from derivepassphrase._internals import (

+    cli_machinery as cli_machinery,  # noqa: PLC0414

+)

 from tests import data, machinery

 from tests.machinery import pytest as pytest_machinery

@@ -32,7 +35,8 @@ DUMMY_CONFIG_SETTINGS = data.DUMMY_CONFIG_SETTINGS

 def bash_format(item: click.shell_completion.CompletionItem) -> str:

     """A formatter for `bash`-style shell completion items.

-    The format is `type,value`, and is dictated by [`click`][].

+    The format is `type,value`, and is dictated by

+    [`click`](https://pypi.org/project/click/).

     """

     type, value = (  # noqa: A001

@@ -45,7 +49,8 @@ def bash_format(item: click.shell_completion.CompletionItem) -> str:

 def fish_format(item: click.shell_completion.CompletionItem) -> str:

     r"""A formatter for `fish`-style shell completion items.

-    The format is `type,value<tab>help`, and is dictated by [`click`][].

+    The format is `type,value<tab>help`, and is dictated by

+    [`click`](https://pypi.org/project/click/).

     """

     type, value, help = (  # noqa: A001

@@ -60,11 +65,11 @@ def zsh_format(item: click.shell_completion.CompletionItem) -> str:

     r"""A formatter for `zsh`-style shell completion items.

     The format is `type<newline>value<newline>help<newline>`, and is

-    dictated by [`click`][].  Upstream `click` up to and including

-    v8.2.1 does not deal with colons in the value correctly when the

-    help text is non-degenerate.  Our formatter here does, provided the

-    upstream `zsh` completion script is used; see the

-    [`cli_machinery.ZshComplete`][] class.

+    dictated by [`click`](https://pypi.org/project/click/).  Upstream

+    `click` up to and including v8.2.1 does not deal with colons in the

+    value correctly when the help text is non-degenerate.  Our formatter

+    here does, provided the upstream `zsh` completion script is used;

+    see the [`cli_machinery.ZshComplete`][] class.

     """

     empty_help = "_"

@@ -20,7 +20,6 @@ import types

 from typing import TYPE_CHECKING, NamedTuple

 import click

-import click.testing

 import hypothesis

 import pytest

 from hypothesis import strategies

@@ -827,7 +826,7 @@ class TestShellExportScriptParsing:

     def test_sh_export_line_parsing(

         self, line: str, env_name: str, value: str | None

     ) -> None:

-        """[`tests.parse_sh_export_line`][] works."""

+        """[`tests.data.callables.parse_sh_export_line`][] works."""

         if value is not None:

             assert (

                 callables.parse_sh_export_line(line, env_name=env_name)