From 95a6210e96177dd2049aed562d01926eae0dee05 Mon Sep 17 00:00:00 2001 From: Cristiano Nicolai <570894+cristianonicolai@users.noreply.github.com> Date: Tue, 23 Jan 2024 00:01:11 +1000 Subject: [PATCH] Rename project to ansible-dev-environment --- .gitignore | 2 +- .vscode/launch.json | 2 +- README.md | 14 +++++----- docs/index.md | 12 ++++---- mkdocs.yml | 10 +++---- pyproject.toml | 12 ++++---- .../__init__.py | 0 src/ansible_dev_environment/__main__.py | 11 ++++++++ .../arg_parser.py | 4 +-- .../cli.py | 2 +- .../collection.py | 0 .../config.py | 4 +-- .../output.py | 2 +- .../subcommands/__init__.py | 2 +- .../subcommands/checker.py | 10 +++---- .../subcommands/inspector.py | 6 ++-- .../subcommands/installer.py | 8 +++--- .../subcommands/lister.py | 8 +++--- .../subcommands/treemaker.py | 8 +++--- .../subcommands/uninstaller.py | 8 +++--- .../tree.py | 0 .../utils.py | 0 .../__main__.py | 11 -------- tests/integration/test_basic.py | 28 +++++++++---------- tests/unit/test_tree.py | 6 ++-- tests/unit/test_utils.py | 10 +++---- 26 files changed, 90 insertions(+), 90 deletions(-) rename src/{ansible_development_environment => ansible_dev_environment}/__init__.py (100%) create mode 100644 src/ansible_dev_environment/__main__.py rename src/{ansible_development_environment => ansible_dev_environment}/arg_parser.py (98%) rename src/{ansible_development_environment => ansible_dev_environment}/cli.py (99%) rename src/{ansible_development_environment => ansible_dev_environment}/collection.py (100%) rename src/{ansible_development_environment => ansible_dev_environment}/config.py (97%) rename src/{ansible_development_environment => ansible_dev_environment}/output.py (99%) rename src/{ansible_development_environment => ansible_dev_environment}/subcommands/__init__.py (91%) rename src/{ansible_development_environment => ansible_dev_environment}/subcommands/checker.py (96%) rename src/{ansible_development_environment => ansible_dev_environment}/subcommands/inspector.py (85%) rename src/{ansible_development_environment => ansible_dev_environment}/subcommands/installer.py (98%) rename src/{ansible_development_environment => ansible_dev_environment}/subcommands/lister.py (92%) rename src/{ansible_development_environment => ansible_dev_environment}/subcommands/treemaker.py (95%) rename src/{ansible_development_environment => ansible_dev_environment}/subcommands/uninstaller.py (93%) rename src/{ansible_development_environment => ansible_dev_environment}/tree.py (100%) rename src/{ansible_development_environment => ansible_dev_environment}/utils.py (100%) delete mode 100644 src/ansible_development_environment/__main__.py diff --git a/.gitignore b/.gitignore index d997871..1058fa3 100644 --- a/.gitignore +++ b/.gitignore @@ -166,6 +166,6 @@ cython_debug/ # and should all have detailed explanations # Version created and populated by setuptools_scm -/src/ansible_development_environment/_version.py +/src/ansible_dev_environment/_version.py .DS_Store diff --git a/.vscode/launch.json b/.vscode/launch.json index a51bbb7..088ffa2 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,7 +8,7 @@ "name": "Python: Module", "type": "python", "request": "launch", - "module": "ansible_development_environment", + "module": "ansible_dev_environment", "args": ["inspect", "-v", "-v", "-vv"], "justMyCode": true }, diff --git a/README.md b/README.md index c411790..a903f73 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ansible-development-environment +# ansible-dev-environment A pip-like install for ansible collections. @@ -19,10 +19,10 @@ By placing collections into the python site-packages directory they are discover ### Setting up a development environment ``` -$ pip install ansible-development-environment --user +$ pip install ansible-dev-environment --user $ git clone $ cd -$ ansible-development-environment install -e .\[test] --venv venv +$ ansible-dev-environment install -e .\[test] --venv venv INFO: Found collection name: network.interfaces from /home/bthornto/github/network.interfaces/galaxy.yml. INFO: Creating virtual environment: /home/bthornto/github/network.interfaces/venv INFO: Virtual environment: /home/bthornto/github/network.interfaces/venv @@ -44,7 +44,7 @@ source venv/bin/activate ### Tearing down the development environment ``` -$ ansible-development-environment uninstall ansible.scm +$ ansible-dev-environment uninstall ansible.scm INFO Found collection name: ansible.scm from /home/bthornto/github/ansible.scm/galaxy.yml. INFO Requirements file /home/bthornto/github/ansible.scm/requirements.txt is empty, skipping INFO Uninstalling python requirements from /home/bthornto/github/ansible.scm/test-requirements.txt @@ -57,8 +57,8 @@ INFO Removed collection root: /home/bthornto/github/ansible.scm/venv/lib64/p ## Help -`ansible-development-environment --help` +`ansible-dev-environment --help` -`ansible-development-environment install --help` +`ansible-dev-environment install --help` -`ansible-development-environment uninstall --help` +`ansible-dev-environment uninstall --help` diff --git a/docs/index.md b/docs/index.md index 43bf88a..1043234 100644 --- a/docs/index.md +++ b/docs/index.md @@ -19,10 +19,10 @@ By placing collections into the python site-packages directory they are discover ### Setting up a development environment ``` -$ pip install ansible-development-environment --user +$ pip install ansible-dev-environment --user $ git clone $ cd -$ ansible-development-environment install -e .\[test] --venv venv +$ ansible-dev-environment install -e .\[test] --venv venv INFO: Found collection name: network.interfaces from /home/bthornto/github/network.interfaces/galaxy.yml. INFO: Creating virtual environment: /home/bthornto/github/network.interfaces/venv INFO: Virtual environment: /home/bthornto/github/network.interfaces/venv @@ -44,7 +44,7 @@ source venv/bin/activate ### Tearing down the development environment ``` -$ ansible-development-environment uninstall ansible.scm +$ ansible-dev-environment uninstall ansible.scm INFO Found collection name: ansible.scm from /home/bthornto/github/ansible.scm/galaxy.yml. INFO Requirements file /home/bthornto/github/ansible.scm/requirements.txt is empty, skipping INFO Uninstalling python requirements from /home/bthornto/github/ansible.scm/test-requirements.txt @@ -57,8 +57,8 @@ INFO Removed collection root: /home/bthornto/github/ansible.scm/venv/lib64/p ## Help -`ansible-development-environment --help` +`ansible-dev-environment --help` -`ansible-development-environment install --help` +`ansible-dev-environment install --help` -`ansible-development-environment uninstall --help` +`ansible-dev-environment uninstall --help` diff --git a/mkdocs.yml b/mkdocs.yml index 4619dc4..412bbc8 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,7 +1,7 @@ --- site_name: Ansible Development Environment Documentation site_url: https://ansible.readthedocs.io/projects/development-environment/ -repo_url: https://github.com/ansible/ansible-development-environment +repo_url: https://github.com/ansible/ansible-dev-environment edit_uri: blob/main/docs/ copyright: Copyright © 2023 Red Hat, Inc. docs_dir: docs @@ -22,10 +22,10 @@ theme: extra: social: - icon: fontawesome/brands/python - link: https://pypi.org/project/ansible-development-environment/ + link: https://pypi.org/project/ansible-dev-environment/ name: PyPI - icon: fontawesome/solid/scroll - link: https://github.com/ansible/ansible-development-environment/releases + link: https://github.com/ansible/ansible-dev-environment/releases name: Releases - icon: simple/mastodon link: https://fosstodon.org/@ansible @@ -34,10 +34,10 @@ extra: link: https://matrix.to/#/#devtools:ansible.com name: Matrix - icon: fontawesome/solid/comments - link: https://github.com/ansible/ansible-development-environment/discussions + link: https://github.com/ansible/ansible-dev-environment/discussions name: Discussions - icon: fontawesome/brands/github-alt - link: https://github.com/ansible/ansible-development-environment + link: https://github.com/ansible/ansible-dev-environment name: GitHub nav: diff --git a/pyproject.toml b/pyproject.toml index a9eabee..d08fb93 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,18 +27,18 @@ dynamic = ["dependencies", "optional-dependencies", "version"] keywords = ["ansible"] license = {text = "GPL-3.0-only"} maintainers = [{"email" = "bthornto@redhat.com", "name" = "Bradley Thornton"}] -name = "ansible-development-environment" +name = "ansible-dev-environment" readme = "README.md" requires-python = ">=3.10" [project.scripts] -ansible-development-environment = "ansible_development_environment.cli:main" +ansible-dev-environment = "ansible_dev_environment.cli:main" [project.urls] -changelog = "https://github.com/cidrblock/ansible-development-environment/releases" +changelog = "https://github.com/cidrblock/ansible-dev-environment/releases" documentation = "https://ansible.readthedocs.io/projects/development-environment/" -homepage = "https://github.com/ansible/ansible-development-environment" -repository = "https://github.com/ansible/ansible-development-environment" +homepage = "https://github.com/ansible/ansible-dev-environment" +repository = "https://github.com/ansible/ansible-dev-environment" [tool.coverage.report] exclude_lines = ["if TYPE_CHECKING:", "pragma: no cover"] @@ -282,7 +282,7 @@ optional-dependencies.test = {file = [".config/requirements-test.in"]} [tool.setuptools_scm] local_scheme = "no-local-version" -write_to = "src/ansible_development_environment/_version.py" +write_to = "src/ansible_dev_environment/_version.py" [tool.tomlsort] all = true diff --git a/src/ansible_development_environment/__init__.py b/src/ansible_dev_environment/__init__.py similarity index 100% rename from src/ansible_development_environment/__init__.py rename to src/ansible_dev_environment/__init__.py diff --git a/src/ansible_dev_environment/__main__.py b/src/ansible_dev_environment/__main__.py new file mode 100644 index 0000000..fdf08a3 --- /dev/null +++ b/src/ansible_dev_environment/__main__.py @@ -0,0 +1,11 @@ +"""A runpy entry point for ansible-dev-environment. + +This makes it possible to invoke CLI +via :command:`python -m ansible_dev_environment`. +""" + +from .cli import main + + +if __name__ == "__main__": + main() diff --git a/src/ansible_development_environment/arg_parser.py b/src/ansible_dev_environment/arg_parser.py similarity index 98% rename from src/ansible_development_environment/arg_parser.py rename to src/ansible_dev_environment/arg_parser.py index 70919c4..c0ed006 100644 --- a/src/ansible_development_environment/arg_parser.py +++ b/src/ansible_dev_environment/arg_parser.py @@ -15,7 +15,7 @@ import pkg_resources __version__ = pkg_resources.get_distribution( - "ansible_development_environment", + "ansible_dev_environment", ).version except Exception: # pylint: disable=broad-except # noqa: BLE001 # this is the fallback SemVer version picked by setuptools_scm when tag @@ -33,7 +33,7 @@ def common_args(parser: ArgumentParser) -> None: "--lf", "--log-file ", dest="log_file", - default=str(Path.cwd() / "ansible-development-environment.log"), + default=str(Path.cwd() / "ansible-dev-environment.log"), help="Log file to write to.", ) parser.add_argument( diff --git a/src/ansible_development_environment/cli.py b/src/ansible_dev_environment/cli.py similarity index 99% rename from src/ansible_development_environment/cli.py rename to src/ansible_dev_environment/cli.py index 3672eab..134d0af 100644 --- a/src/ansible_development_environment/cli.py +++ b/src/ansible_dev_environment/cli.py @@ -9,7 +9,7 @@ from pathlib import Path from typing import TYPE_CHECKING -from ansible_development_environment import subcommands +from ansible_dev_environment import subcommands from .arg_parser import parse from .config import Config diff --git a/src/ansible_development_environment/collection.py b/src/ansible_dev_environment/collection.py similarity index 100% rename from src/ansible_development_environment/collection.py rename to src/ansible_dev_environment/collection.py diff --git a/src/ansible_development_environment/config.py b/src/ansible_dev_environment/config.py similarity index 97% rename from src/ansible_development_environment/config.py rename to src/ansible_dev_environment/config.py index 5ad9629..0629646 100644 --- a/src/ansible_development_environment/config.py +++ b/src/ansible_dev_environment/config.py @@ -1,4 +1,4 @@ -"""Constants, for now, for ansible-development-environment.""" +"""Constants, for now, for ansible-dev-environment.""" from __future__ import annotations @@ -51,7 +51,7 @@ def init(self: Config) -> None: @property def cache_dir(self: Config) -> Path: """Return the cache directory.""" - cache_dir = self.venv / ".ansible-development-environment" + cache_dir = self.venv / ".ansible-dev-environment" if not cache_dir.exists(): cache_dir.mkdir(parents=True) return cache_dir diff --git a/src/ansible_development_environment/output.py b/src/ansible_dev_environment/output.py similarity index 99% rename from src/ansible_development_environment/output.py rename to src/ansible_dev_environment/output.py index c7dd9dc..5481261 100644 --- a/src/ansible_development_environment/output.py +++ b/src/ansible_dev_environment/output.py @@ -235,7 +235,7 @@ def __init__( # noqa: PLR0913 "warning": 0, } self.term_features = term_features - self.logger = logging.getLogger("ansible_development_environment") + self.logger = logging.getLogger("ansible_dev_environment") if log_level != "notset": self.logger.setLevel(log_level.upper()) self.log_to_file = bool(log_file) diff --git a/src/ansible_development_environment/subcommands/__init__.py b/src/ansible_dev_environment/subcommands/__init__.py similarity index 91% rename from src/ansible_development_environment/subcommands/__init__.py rename to src/ansible_dev_environment/subcommands/__init__.py index e2d6781..d48f1aa 100644 --- a/src/ansible_development_environment/subcommands/__init__.py +++ b/src/ansible_dev_environment/subcommands/__init__.py @@ -1,4 +1,4 @@ -"""The subcommands module contains all the subcommands for ansible-development-environment.""" +"""The subcommands module contains all the subcommands for ansible-dev-environment.""" # ruff: noqa: F401 diff --git a/src/ansible_development_environment/subcommands/checker.py b/src/ansible_dev_environment/subcommands/checker.py similarity index 96% rename from src/ansible_development_environment/subcommands/checker.py rename to src/ansible_dev_environment/subcommands/checker.py index 74d0460..ed6a9b9 100644 --- a/src/ansible_development_environment/subcommands/checker.py +++ b/src/ansible_dev_environment/subcommands/checker.py @@ -10,7 +10,7 @@ from packaging.specifiers import InvalidSpecifier, SpecifierSet from packaging.version import Version -from ansible_development_environment.utils import ( +from ansible_dev_environment.utils import ( builder_introspect, collect_manifests, oxford_join, @@ -19,8 +19,8 @@ if TYPE_CHECKING: - from ansible_development_environment.config import Config - from ansible_development_environment.output import Output + from ansible_dev_environment.config import Config + from ansible_dev_environment.output import Output class Checker: @@ -122,7 +122,7 @@ def _collection_deps(self: Checker) -> None: # noqa: C901, PLR0912, PLR0915 f" {dep} {version} but it is not installed." ) self._output.error(err) - msg = f"Try running `ansible-development-environment install {dep}`" + msg = f"Try running `ansible-dev-environment install {dep}`" self._output.hint(msg) missing = True @@ -136,7 +136,7 @@ def _python_deps(self: Checker) -> None: if self._system_dep_missing: msg = "System packages are missing. Python dependency checking may fail." self._output.warning(msg) - msg = "Install system packages and re-run `ansible-development-environment check`." + msg = "Install system packages and re-run `ansible-dev-environment check`." self._output.hint(msg) missing_file = self._config.venv_cache_dir / "pip-report.txt" command = ( diff --git a/src/ansible_development_environment/subcommands/inspector.py b/src/ansible_dev_environment/subcommands/inspector.py similarity index 85% rename from src/ansible_development_environment/subcommands/inspector.py rename to src/ansible_dev_environment/subcommands/inspector.py index 0f62465..4e213be 100644 --- a/src/ansible_development_environment/subcommands/inspector.py +++ b/src/ansible_dev_environment/subcommands/inspector.py @@ -6,12 +6,12 @@ from typing import TYPE_CHECKING -from ansible_development_environment.utils import collect_manifests +from ansible_dev_environment.utils import collect_manifests if TYPE_CHECKING: - from ansible_development_environment.config import Config - from ansible_development_environment.output import Output + from ansible_dev_environment.config import Config + from ansible_dev_environment.output import Output try: from pip._vendor.rich import print_json diff --git a/src/ansible_development_environment/subcommands/installer.py b/src/ansible_dev_environment/subcommands/installer.py similarity index 98% rename from src/ansible_development_environment/subcommands/installer.py rename to src/ansible_dev_environment/subcommands/installer.py index d8c7c15..5058564 100644 --- a/src/ansible_development_environment/subcommands/installer.py +++ b/src/ansible_dev_environment/subcommands/installer.py @@ -9,11 +9,11 @@ from pathlib import Path from typing import TYPE_CHECKING -from ansible_development_environment.collection import ( +from ansible_dev_environment.collection import ( Collection, parse_collection_request, ) -from ansible_development_environment.utils import ( +from ansible_dev_environment.utils import ( builder_introspect, collections_from_requirements, oxford_join, @@ -24,8 +24,8 @@ if TYPE_CHECKING: - from ansible_development_environment.config import Config - from ansible_development_environment.output import Output + from ansible_dev_environment.config import Config + from ansible_dev_environment.output import Output class Installer: diff --git a/src/ansible_development_environment/subcommands/lister.py b/src/ansible_dev_environment/subcommands/lister.py similarity index 92% rename from src/ansible_development_environment/subcommands/lister.py rename to src/ansible_dev_environment/subcommands/lister.py index 3e33a45..a259601 100644 --- a/src/ansible_development_environment/subcommands/lister.py +++ b/src/ansible_dev_environment/subcommands/lister.py @@ -1,15 +1,15 @@ -"""Lister module for ansible-development-environment.""" +"""Lister module for ansible-dev-environment.""" from __future__ import annotations from typing import TYPE_CHECKING -from ansible_development_environment.utils import collect_manifests, term_link +from ansible_dev_environment.utils import collect_manifests, term_link if TYPE_CHECKING: - from ansible_development_environment.config import Config - from ansible_development_environment.output import Output + from ansible_dev_environment.config import Config + from ansible_dev_environment.output import Output class Lister: diff --git a/src/ansible_development_environment/subcommands/treemaker.py b/src/ansible_dev_environment/subcommands/treemaker.py similarity index 95% rename from src/ansible_development_environment/subcommands/treemaker.py rename to src/ansible_dev_environment/subcommands/treemaker.py index 506501f..7565b03 100644 --- a/src/ansible_development_environment/subcommands/treemaker.py +++ b/src/ansible_dev_environment/subcommands/treemaker.py @@ -5,13 +5,13 @@ from typing import TYPE_CHECKING -from ansible_development_environment.tree import Tree -from ansible_development_environment.utils import builder_introspect, collect_manifests +from ansible_dev_environment.tree import Tree +from ansible_dev_environment.utils import builder_introspect, collect_manifests if TYPE_CHECKING: - from ansible_development_environment.config import Config - from ansible_development_environment.output import Output + from ansible_dev_environment.config import Config + from ansible_dev_environment.output import Output ScalarVal = bool | str | float | int | None JSONVal = ScalarVal | list["JSONVal"] | dict[str, "JSONVal"] diff --git a/src/ansible_development_environment/subcommands/uninstaller.py b/src/ansible_dev_environment/subcommands/uninstaller.py similarity index 93% rename from src/ansible_development_environment/subcommands/uninstaller.py rename to src/ansible_dev_environment/subcommands/uninstaller.py index d4cd513..0da80ff 100644 --- a/src/ansible_development_environment/subcommands/uninstaller.py +++ b/src/ansible_dev_environment/subcommands/uninstaller.py @@ -7,16 +7,16 @@ from pathlib import Path from typing import TYPE_CHECKING -from ansible_development_environment.collection import ( +from ansible_dev_environment.collection import ( Collection, parse_collection_request, ) -from ansible_development_environment.utils import collections_from_requirements +from ansible_dev_environment.utils import collections_from_requirements if TYPE_CHECKING: - from ansible_development_environment.config import Config - from ansible_development_environment.output import Output + from ansible_dev_environment.config import Config + from ansible_dev_environment.output import Output class UnInstaller: diff --git a/src/ansible_development_environment/tree.py b/src/ansible_dev_environment/tree.py similarity index 100% rename from src/ansible_development_environment/tree.py rename to src/ansible_dev_environment/tree.py diff --git a/src/ansible_development_environment/utils.py b/src/ansible_dev_environment/utils.py similarity index 100% rename from src/ansible_development_environment/utils.py rename to src/ansible_dev_environment/utils.py diff --git a/src/ansible_development_environment/__main__.py b/src/ansible_development_environment/__main__.py deleted file mode 100644 index 69ea7cc..0000000 --- a/src/ansible_development_environment/__main__.py +++ /dev/null @@ -1,11 +0,0 @@ -"""A runpy entry point for ansible-development-environment. - -This makes it possible to invoke CLI -via :command:`python -m ansible_development_environment`. -""" - -from .cli import main - - -if __name__ == "__main__": - main() diff --git a/tests/integration/test_basic.py b/tests/integration/test_basic.py index 208ddfd..b21f626 100644 --- a/tests/integration/test_basic.py +++ b/tests/integration/test_basic.py @@ -6,9 +6,9 @@ import pytest -from ansible_development_environment.cli import main -from ansible_development_environment.output import Output -from ansible_development_environment.utils import TermFeatures, subprocess_run +from ansible_dev_environment.cli import main +from ansible_dev_environment.output import Output +from ansible_dev_environment.utils import TermFeatures, subprocess_run def test_venv( @@ -20,7 +20,7 @@ def test_venv( # disable color for json output term_features = TermFeatures(color=False, links=False) output = Output( - log_file=f"/{tmp_path}/ansible-development-environment.log", + log_file=f"/{tmp_path}/ansible-dev-environment.log", log_level="INFO", log_append="false", term_features=term_features, @@ -41,7 +41,7 @@ def test_venv( monkeypatch.setattr( "sys.argv", [ - "ansible-development-environment", + "ansible-dev-environment", "install", str(tmp_path / "cisco.nxos"), "--venv=venv", @@ -57,7 +57,7 @@ def test_venv( monkeypatch.setattr( "sys.argv", - ["ansible-development-environment", "list", "--venv=venv"], + ["ansible-dev-environment", "list", "--venv=venv"], ) with pytest.raises(SystemExit): main() @@ -70,7 +70,7 @@ def test_venv( monkeypatch.setattr( "sys.argv", [ - "ansible-development-environment", + "ansible-dev-environment", "uninstall", "ansible.utils", "--venv=venv", @@ -83,7 +83,7 @@ def test_venv( monkeypatch.setattr( "sys.argv", - ["ansible-development-environment", "inspect", "--venv=venv", "--no-ansi"], + ["ansible-dev-environment", "inspect", "--venv=venv", "--no-ansi"], ) with pytest.raises(SystemExit): main() @@ -95,7 +95,7 @@ def test_venv( monkeypatch.setattr( "sys.argv", - ["ansible-development-environment", "check", "--venv=venv"], + ["ansible-dev-environment", "check", "--venv=venv"], ) with pytest.raises(SystemExit): main() @@ -112,7 +112,7 @@ def test_non_local( monkeypatch.setattr( "sys.argv", [ - "ansible-development-environment", + "ansible-dev-environment", "install", "ansible.scm", f"--venv={tmp_path / 'venv'}", @@ -125,7 +125,7 @@ def test_non_local( assert string in captured.out monkeypatch.setattr( "sys.argv", - ["ansible-development-environment", "tree", f"--venv={tmp_path / 'venv'}"], + ["ansible-dev-environment", "tree", f"--venv={tmp_path / 'venv'}"], ) with pytest.raises(SystemExit): main() @@ -147,7 +147,7 @@ def test_requirements( monkeypatch.setattr( "sys.argv", [ - "ansible-development-environment", + "ansible-dev-environment", "install", f"--venv={tmp_path / 'venv'}", "-r", @@ -162,7 +162,7 @@ def test_requirements( monkeypatch.setattr( "sys.argv", [ - "ansible-development-environment", + "ansible-dev-environment", "uninstall", f"--venv={tmp_path / 'venv'}", "-r", @@ -179,7 +179,7 @@ def test_requirements( monkeypatch.setattr( "sys.argv", - ["ansible-development-environment", "list", f"--venv={tmp_path / 'venv'}"], + ["ansible-dev-environment", "list", f"--venv={tmp_path / 'venv'}"], ) with pytest.raises(SystemExit): main() diff --git a/tests/unit/test_tree.py b/tests/unit/test_tree.py index 1f099e0..fda3712 100644 --- a/tests/unit/test_tree.py +++ b/tests/unit/test_tree.py @@ -5,12 +5,12 @@ from typing import TYPE_CHECKING -from ansible_development_environment.tree import Tree -from ansible_development_environment.utils import TermFeatures +from ansible_dev_environment.tree import Tree +from ansible_dev_environment.utils import TermFeatures if TYPE_CHECKING: - from ansible_development_environment.tree import JSONVal + from ansible_dev_environment.tree import JSONVal sample_1: JSONVal = { diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index 16240df..95a93e8 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -7,19 +7,19 @@ import pytest -from ansible_development_environment.collection import ( +from ansible_dev_environment.collection import ( Collection, parse_collection_request, ) -from ansible_development_environment.config import Config -from ansible_development_environment.output import Output -from ansible_development_environment.utils import TermFeatures +from ansible_dev_environment.config import Config +from ansible_dev_environment.output import Output +from ansible_dev_environment.utils import TermFeatures term_features = TermFeatures(color=False, links=False) output = Output( - log_file=str(Path.cwd() / "ansible-development-environment.log"), + log_file=str(Path.cwd() / "ansible-dev-environment.log"), log_level="notset", log_append="true", term_features=term_features,