Skip to content

Commit

Permalink
fix: rename method argument
Browse files Browse the repository at this point in the history
  • Loading branch information
Mousa Zeid Baker committed Oct 9, 2023
1 parent c6bd601 commit ff59b3d
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 15 deletions.
18 changes: 11 additions & 7 deletions src/poetry_plugin_up/command.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class UpCommand(InstallerCommand):
option(
long_name="exclude",
short_name=None,
description="The dependency names to exclude.",
description="Exclude dependencies.",
multiple=True,
flag=False,
),
Expand All @@ -67,7 +67,7 @@ def handle(self) -> int:
pinned = self.option("pinned")
no_install = self.option("no-install")
dry_run = self.option("dry-run")
exclude_names = self.option("exclude")
exclude = self.option("exclude")

if pinned and not latest:
self.line_error("'--pinned' specified without '--latest'")
Expand All @@ -86,7 +86,7 @@ def handle(self) -> int:
only_packages=only_packages,
pyproject_content=pyproject_content,
selector=selector,
exclude_names=exclude_names,
exclude=exclude,
)

if dry_run:
Expand Down Expand Up @@ -124,12 +124,16 @@ def handle_dependency(
only_packages: List[str],
pyproject_content: TOMLDocument,
selector: VersionSelector,
exclude_names: List[str] = None,
exclude: List[str],
) -> None:
"""Handles a dependency"""

if not self.is_bumpable(
dependency, only_packages, latest, pinned, exclude_names
dependency,
only_packages,
latest,
pinned,
exclude,
):
return

Expand Down Expand Up @@ -175,7 +179,7 @@ def is_bumpable(
only_packages: List[str],
latest: bool,
pinned: bool,
exclude_names: List[str] = None,
exclude: List[str],
) -> bool:
"""Determines if a dependency can be bumped in pyproject.toml"""

Expand All @@ -185,7 +189,7 @@ def is_bumpable(
return False
if only_packages and dependency.name not in only_packages:
return False
if exclude_names and dependency.name in exclude_names:
if dependency.name in exclude:
return False

constraint = dependency.pretty_constraint
Expand Down
8 changes: 3 additions & 5 deletions tests/e2e/test_e2e.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ def test_pinned_without_latest_fails(app_tester: ApplicationTester) -> None:
assert app_tester.execute("up --pinned") == 1


def test_command_with_excluded_names(
def test_command_with_exclude(
app_tester: ApplicationTester,
packages: List[Package],
mocker: MockerFixture,
Expand All @@ -168,13 +168,11 @@ def test_command_with_excluded_names(
return_value=None,
)

path = project_path / "expected_pyproject_with_excluded_name.toml"
path = project_path / "expected_pyproject_with_exclude.toml"
expected = PyProjectTOML(path).file.read()

assert (
app_tester.execute(
"up --exclude-name foo --exclude-name bar --exclude-name=grault"
)
app_tester.execute("up --exclude foo --exclude bar --exclude=grault")
== 0
)
assert PyProjectTOML(tmp_pyproject_path).file.read() == expected
Expand Down
5 changes: 4 additions & 1 deletion tests/integration/test_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ def test_handle_dependency(
latest=False,
pinned=False,
only_packages=[],
exclude=[],
pyproject_content=content,
selector=selector,
)
Expand Down Expand Up @@ -83,6 +84,7 @@ def test_handle_dependency_with_latest(
latest=True,
pinned=True,
only_packages=[],
exclude=[],
pyproject_content=content,
selector=selector,
)
Expand Down Expand Up @@ -129,6 +131,7 @@ def test_handle_dependency_with_zero_caret(
latest=True,
pinned=False,
only_packages=[],
exclude=[],
pyproject_content=content,
selector=selector,
)
Expand Down Expand Up @@ -171,9 +174,9 @@ def test_handle_dependency_excluded(
latest=False,
pinned=False,
only_packages=[],
exclude=["foo"],
pyproject_content=content,
selector=selector,
exclude_names=["foo"],
)

selector.find_best_candidate.assert_not_called()
Expand Down
27 changes: 25 additions & 2 deletions tests/unit/test_unit.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ def test_is_bumpable_is_false_when_source_type_is_git(
only_packages=[],
latest=False,
pinned=False,
exclude=[],
)
assert is_bumpable is False

Expand All @@ -133,6 +134,7 @@ def test_is_bumpable_is_false_when_source_type_is_file(
only_packages=[],
latest=False,
pinned=False,
exclude=[],
)
assert is_bumpable is False

Expand All @@ -150,6 +152,7 @@ def test_is_bumpable_is_false_when_source_type_is_directory(
only_packages=[],
latest=False,
pinned=False,
exclude=[],
)
assert is_bumpable is False

Expand All @@ -163,6 +166,7 @@ def test_is_bumpable_is_false_when_name_is_python(
only_packages=[],
latest=False,
pinned=False,
exclude=[],
)
assert is_bumpable is False

Expand All @@ -176,6 +180,7 @@ def test_is_bumpable_is_false_when_dependency_not_in_only_packages(
only_packages=["bar"],
latest=False,
pinned=False,
exclude=[],
)
assert is_bumpable is False

Expand All @@ -192,6 +197,7 @@ def test_is_bumpable_is_false_when_version_pinned(
only_packages=[],
latest=False,
pinned=False,
exclude=[],
)
assert is_bumpable is False

Expand All @@ -208,6 +214,7 @@ def test_is_bumpable_is_false_when_version_wildcard(
only_packages=[],
latest=False,
pinned=False,
exclude=[],
)
assert is_bumpable is False

Expand All @@ -224,6 +231,7 @@ def test_is_bumpable_is_false_when_version_less_than(
only_packages=[],
latest=False,
pinned=False,
exclude=[],
)
assert is_bumpable is False

Expand All @@ -240,6 +248,7 @@ def test_is_bumpable_is_false_when_version_greater_than(
only_packages=[],
latest=False,
pinned=False,
exclude=[],
)
assert is_bumpable is False

Expand All @@ -256,6 +265,7 @@ def test_is_bumpable_is_false_when_version_less_than_or_equal(
only_packages=[],
latest=False,
pinned=False,
exclude=[],
)
assert is_bumpable is False

Expand All @@ -272,6 +282,7 @@ def test_is_bumpable_is_false_when_version_inequality(
only_packages=[],
latest=False,
pinned=False,
exclude=[],
)
assert is_bumpable is False

Expand All @@ -288,6 +299,7 @@ def test_is_bumpable_is_false_when_version_multiple_requirements(
only_packages=[],
latest=False,
pinned=False,
exclude=[],
)
assert is_bumpable is False

Expand All @@ -304,6 +316,7 @@ def test_is_bumpable_is_true_when_version_caret(
only_packages=[],
latest=False,
pinned=False,
exclude=[],
)
assert is_bumpable is True

Expand All @@ -320,6 +333,7 @@ def test_is_bumpable_is_true_when_version_tilde(
only_packages=[],
latest=False,
pinned=False,
exclude=[],
)
assert is_bumpable is True

Expand All @@ -336,6 +350,7 @@ def test_is_bumpable_is_true_when_version_greater_than_or_equal(
only_packages=[],
latest=False,
pinned=False,
exclude=[],
)
assert is_bumpable is True

Expand All @@ -352,6 +367,7 @@ def test_is_bumpable_is_true_when_version_tilde_pep440(
only_packages=[],
latest=False,
pinned=False,
exclude=[],
)
assert is_bumpable is True

Expand All @@ -368,6 +384,7 @@ def test_is_bumpable_is_false_when_version_pinned_and_latest(
only_packages=[],
latest=True,
pinned=False,
exclude=[],
)
assert is_bumpable is False

Expand All @@ -384,6 +401,7 @@ def test_is_bumpable_is_true_when_version_pinned_and_latest_and_pinned(
only_packages=[],
latest=True,
pinned=True,
exclude=[],
)
assert is_bumpable is True

Expand All @@ -408,6 +426,7 @@ def test_is_bumpable_is_false_when_version_pinned_with_with_equals_and_latest(
only_packages=[],
latest=True,
pinned=False,
exclude=[],
)
assert is_bumpable is False

Expand All @@ -424,6 +443,7 @@ def test_is_bumpable_is_true_when_version_wildcard_and_latest(
only_packages=[],
latest=True,
pinned=False,
exclude=[],
)
assert is_bumpable is True

Expand All @@ -440,6 +460,7 @@ def test_is_bumpable_is_true_when_version_less_than_and_latest(
only_packages=[],
latest=True,
pinned=False,
exclude=[],
)
assert is_bumpable is True

Expand All @@ -456,6 +477,7 @@ def test_is_bumpable_is_true_when_version_greater_than_and_latest(
only_packages=[],
latest=True,
pinned=False,
exclude=[],
)
assert is_bumpable is True

Expand All @@ -472,11 +494,12 @@ def test_is_bumpable_is_true_when_version_less_than_or_equal_and_latest(
only_packages=[],
latest=True,
pinned=False,
exclude=[],
)
assert is_bumpable is True


def test_is_bumpable_is_false_when_dependency_in_excluded_names(
def test_is_bumpable_is_false_when_dependency_excluded(
up_cmd_tester: TestUpCommand,
) -> None:
dependency = Dependency(
Expand All @@ -488,6 +511,6 @@ def test_is_bumpable_is_false_when_dependency_in_excluded_names(
only_packages=[],
latest=True,
pinned=False,
exclude_names=["foo"],
exclude=["foo"],
)
assert is_bumpable is False

0 comments on commit ff59b3d

Please sign in to comment.