Backport changes from python-poetry/poetry#2398

python-poetry · Jun 5, 2020 · 07c0ff7 · 07c0ff7
1 parent f98842c
commit 07c0ff7
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 0 deletions.
diff --git a/poetry/core/packages/directory_dependency.py b/poetry/core/packages/directory_dependency.py
@@ -81,3 +81,14 @@ def base_pep_508_name(self):  # type: () -> str
         requirement += " @ {}".format(str(self.path))
 
         return requirement
+
+    def __str__(self):
+        if self.is_root:
+            return self._pretty_name
+
+        return "{} ({} {})".format(
+            self._pretty_name, self._pretty_constraint, self._path
+        )
+
+    def __hash__(self):
+        return hash((self._name, self._full_path))
diff --git a/poetry/core/packages/file_dependency.py b/poetry/core/packages/file_dependency.py
@@ -33,6 +33,10 @@ def __init__(
             name, "*", category=category, optional=optional, allows_prereleases=True
         )
 
+    @property
+    def base(self):
+        return self._base
+
     @property
     def path(self):
         return self._path
@@ -63,3 +67,14 @@ def base_pep_508_name(self):  # type: () -> str
         requirement += " @ {}".format(path)
 
         return requirement
+
+    def __str__(self):
+        if self.is_root:
+            return self._pretty_name
+
+        return "{} ({} {})".format(
+            self._pretty_name, self._pretty_constraint, self._path
+        )
+
+    def __hash__(self):
+        return hash((self._name, self._full_path))
diff --git a/poetry/core/packages/package.py b/poetry/core/packages/package.py
@@ -409,6 +409,7 @@ def with_python_versions(self, python_versions):
 
     def clone(self):  # type: () -> Package
         clone = self.__class__(self.pretty_name, self.version)
+        clone.description = self.description
         clone.category = self.category
         clone.optional = self.optional
         clone.python_versions = self.python_versions

diff --git a/poetry/core/packages/url_dependency.py b/poetry/core/packages/url_dependency.py
@@ -38,3 +38,9 @@ def base_pep_508_name(self):  # type: () -> str
 
     def is_url(self):  # type: () -> bool
         return True
+
+    def __str__(self):
+        return "{} ({} url)".format(self._pretty_name, self._pretty_constraint)
+
+    def __hash__(self):
+        return hash((self._name, self._url))
diff --git a/poetry/core/packages/vcs_dependency.py b/poetry/core/packages/vcs_dependency.py
@@ -100,3 +100,11 @@ def is_vcs(self):  # type: () -> bool
 
     def accepts_prereleases(self):  # type: () -> bool
         return True
+
+    def __str__(self):
+        return "{} ({} {})".format(
+            self._pretty_name, self._pretty_constraint, self._vcs
+        )
+
+    def __hash__(self):
+        return hash((self._name, self._vcs, self._branch, self._tag, self._rev))