Skip to content

Commit

Permalink
Remove more code (python-poetry#430)
Browse files Browse the repository at this point in the history
* remove unused accepts_prereleases()

* remove Dependency.accepts()

Co-authored-by: Bartosz Sokorski <[email protected]>
  • Loading branch information
2 people authored and bostonrwalker committed Aug 29, 2022
1 parent 4bb6dd6 commit 9ba1cbd
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 68 deletions.
11 changes: 0 additions & 11 deletions src/poetry/core/packages/dependency.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
from poetry.core.packages.constraints import BaseConstraint
from poetry.core.packages.directory_dependency import DirectoryDependency
from poetry.core.packages.file_dependency import FileDependency
from poetry.core.packages.package import Package
from poetry.core.semver.version_constraint import VersionConstraint
from poetry.core.version.markers import BaseMarker

Expand Down Expand Up @@ -289,16 +288,6 @@ def is_directory(self) -> bool:
def is_url(self) -> bool:
return False

def accepts(self, package: Package) -> bool:
"""
Determines if the given package matches this dependency.
"""
return (
self._name == package.name
and self._constraint.allows(package.version)
and (not package.is_prerelease() or self.allows_prereleases())
)

def to_pep_508(self, with_extras: bool = True) -> str:
from poetry.core.packages.utils.utils import convert_markers

Expand Down
3 changes: 0 additions & 3 deletions src/poetry/core/packages/vcs_dependency.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,3 @@ def base_pep_508_name(self) -> str:

def is_vcs(self) -> bool:
return True

def accepts_prereleases(self) -> bool:
return True
54 changes: 0 additions & 54 deletions tests/packages/test_dependency.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,9 @@
import pytest

from poetry.core.packages.dependency import Dependency
from poetry.core.packages.package import Package
from poetry.core.version.markers import parse_marker


def test_accepts() -> None:
dependency = Dependency("A", "^1.0")
package = Package("A", "1.4")

assert dependency.accepts(package)


@pytest.mark.parametrize(
"constraint,result",
[
Expand All @@ -31,52 +23,6 @@ def test_allows_prerelease(constraint: str, result: bool) -> None:
assert Dependency("A", constraint).allows_prereleases() == result


def test_accepts_prerelease() -> None:
dependency = Dependency("A", "^1.0", allows_prereleases=True)
package = Package("A", "1.4-beta.1")

assert dependency.accepts(package)


def test_accepts_python_versions() -> None:
dependency = Dependency("A", "^1.0")
dependency.python_versions = "^3.6"
package = Package("A", "1.4")
package.python_versions = "~3.6"

assert dependency.accepts(package)


def test_accepts_fails_with_different_names() -> None:
dependency = Dependency("A", "^1.0")
package = Package("B", "1.4")

assert not dependency.accepts(package)


def test_accepts_fails_with_version_mismatch() -> None:
dependency = Dependency("A", "~1.0")
package = Package("B", "1.4")

assert not dependency.accepts(package)


def test_accepts_fails_with_prerelease_mismatch() -> None:
dependency = Dependency("A", "^1.0")
package = Package("B", "1.4-beta.1")

assert not dependency.accepts(package)


def test_accepts_fails_with_python_versions_mismatch() -> None:
dependency = Dependency("A", "^1.0")
dependency.python_versions = "^3.6"
package = Package("B", "1.4")
package.python_versions = "~3.5"

assert not dependency.accepts(package)


def test_to_pep_508() -> None:
dependency = Dependency("Django", "^1.23")

Expand Down

0 comments on commit 9ba1cbd

Please sign in to comment.