From ac344a802a1d97c02bfc688ad346cdf3f43a9065 Mon Sep 17 00:00:00 2001 From: Andrii Kohut Date: Tue, 5 Dec 2023 23:27:46 +0200 Subject: [PATCH 1/2] check for all packages --- src/pdm_readiness/__init__.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pdm_readiness/__init__.py b/src/pdm_readiness/__init__.py index 30005dd..d712ff1 100644 --- a/src/pdm_readiness/__init__.py +++ b/src/pdm_readiness/__init__.py @@ -31,7 +31,11 @@ def add_arguments(self, parser: argparse.ArgumentParser) -> None: def handle(self, project: Project, options: argparse.Namespace) -> None: console = Console() - deps = [d.name for d in project.get_dependencies().values() if d.name] + deps = [] + for group in project.all_dependencies.values(): + for dep in group.values(): + if dep.name: + deps.append(dep.name) if not project.lockfile.exists(): console.print("No lockfile found. Please run `pdm lock` first.", style="red") sys.exit(1) @@ -115,7 +119,7 @@ def handle(self, project: Project, options: argparse.Namespace) -> None: ) for dep, pinned_version, _, supported_versions in supported: console.print( - f" [bold green]✓[/bold green] {dep} ({latest_version})" + f" [bold green]✓[/bold green] {dep} ({pinned_version})" ) if needs_update: console.print(f"[bold]Update required ({len(needs_update)}):[/bold]") From 460909598d7a8455b1ada7328204385f1333821e Mon Sep 17 00:00:00 2001 From: Andrii Kohut Date: Tue, 5 Dec 2023 23:32:17 +0200 Subject: [PATCH 2/2] format & fix the tests --- src/pdm_readiness/__init__.py | 4 +++- tests/test_readiness.py | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/pdm_readiness/__init__.py b/src/pdm_readiness/__init__.py index d712ff1..b88a5bd 100644 --- a/src/pdm_readiness/__init__.py +++ b/src/pdm_readiness/__init__.py @@ -37,7 +37,9 @@ def handle(self, project: Project, options: argparse.Namespace) -> None: if dep.name: deps.append(dep.name) if not project.lockfile.exists(): - console.print("No lockfile found. Please run `pdm lock` first.", style="red") + console.print( + "No lockfile found. Please run `pdm lock` first.", style="red" + ) sys.exit(1) pinned_versions = {d["name"]: d["version"] for d in project.lockfile["package"]} requested_version = Version(".".join(options.python_version.split(".")[:2])) diff --git a/tests/test_readiness.py b/tests/test_readiness.py index f59b0cd..91f7719 100644 --- a/tests/test_readiness.py +++ b/tests/test_readiness.py @@ -13,9 +13,11 @@ @pytest.fixture def project(tmp_path): project = mock.MagicMock(spec=Project) - project.get_dependencies.return_value = { - "foo": Requirement("foo"), - "bar": Requirement("bar"), + project.all_dependencies = { + "default": { + "foo": Requirement("foo"), + "bar": Requirement("bar"), + } } project.lockfile.exists.return_value = True project.lockfile.__getitem__.side_effect = lambda _: [