Fix resolution of path, url and VCS dependencies (#2398)

* Fix resolution of path, url and VCS dependencies

* Fix editable installation of Poetry packages

poetry/installation/pip_installer.py

@@ -1,7 +1,6 @@
 import os
 import tempfile
 
-from io import open
 from subprocess import CalledProcessError
 
 from clikit.api.io import IO
@@ -181,9 +180,7 @@ def create_temporary_requirement(self, package):
         return name
 
     def install_directory(self, package):
-        from poetry.masonry.builder import SdistBuilder
         from poetry.factory import Factory
-        from poetry.utils._compat import decode
         from poetry.utils.env import NullEnv
         from poetry.utils.toml_file import TomlFile
 
@@ -210,17 +207,20 @@ def install_directory(self, package):
 
         setup = os.path.join(req, "setup.py")
         has_setup = os.path.exists(setup)
-        if not has_setup and has_poetry and (package.develop or not has_build_system):
+        if has_poetry and (package.develop or not has_build_system):
             # We actually need to rely on creating a temporary setup.py
             # file since pip, as of this comment, does not support
             # build-system for editable packages
             # We also need it for non-PEP-517 packages
-            builder = SdistBuilder(
+            from poetry.masonry.builders.editable import EditableBuilder
+
+            builder = EditableBuilder(
                 Factory().create_poetry(pyproject.parent), NullEnv(), NullIO()
             )
 
-            with open(setup, "w", encoding="utf-8") as f:
-                f.write(decode(builder.build_setup()))
+            builder.build()
+
+            return
 
         if package.develop:
             args.append("-e")

poetry/mixology/version_solver.py

@@ -339,6 +339,16 @@ def _get_min(dependency):
             if dependency.name in self._locked:
                 return 1
 
+            # VCS, URL, File or Directory dependencies
+            # represent a single version
+            if (
+                dependency.is_vcs()
+                or dependency.is_url()
+                or dependency.is_file()
+                or dependency.is_directory()
+            ):
+                return 1
+
             try:
                 return len(self._provider.search_for(dependency))
             except ValueError:

poetry/packages/directory_dependency.py

@@ -79,3 +79,14 @@ def supports_poetry(self):
 
     def is_directory(self):
         return True
+
+    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))

poetry/packages/file_dependency.py

@@ -41,6 +41,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
@@ -59,3 +63,14 @@ def hash(self):
                 h.update(content)
 
         return h.hexdigest()
+
+    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))

poetry/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

poetry/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))

poetry/packages/vcs_dependency.py

@@ -94,3 +94,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))

poetry/puzzle/provider.py

@@ -72,6 +72,7 @@ def __init__(self, package, pool, io):  # type: (Package, Pool, Any) -> None
         self._search_for = {}
         self._is_debugging = self._io.is_debug() or self._io.is_very_verbose()
         self._in_progress = False
+        self._deferred_cache = {}
 
     @property
     def pool(self):  # type: () -> Pool
@@ -164,6 +165,9 @@ def search_for_vcs(self, dependency):  # type: (VCSDependency) -> List[Package]
         Basically, we clone the repository in a temporary directory
         and get the information we need by checking out the specified reference.
         """
+        if dependency in self._deferred_cache:
+            return [self._deferred_cache[dependency]]
+
         package = self.get_package_from_vcs(
             dependency.vcs,
             dependency.source,
@@ -178,6 +182,11 @@ def search_for_vcs(self, dependency):  # type: (VCSDependency) -> List[Package]
 
                 package.requires += package.extras[extra]
 
+        dependency._constraint = package.version
+        dependency._pretty_constraint = package.version.text
+
+        self._deferred_cache[dependency] = package
+
         return [package]
 
     @classmethod
@@ -214,7 +223,17 @@ def get_package_from_vcs(
         return package
 
     def search_for_file(self, dependency):  # type: (FileDependency) -> List[Package]
-        package = self.get_package_from_file(dependency.full_path)
+        if dependency in self._deferred_cache:
+            dependency, _package = self._deferred_cache[dependency]
+
+            package = _package.clone()
+        else:
+            package = self.get_package_from_file(dependency.full_path)
+
+            dependency._constraint = package.version
+            dependency._pretty_constraint = package.version.text
+
+            self._deferred_cache[dependency] = (dependency, package)
 
         if dependency.name != package.name:
             # For now, the dependency's name must match the actual package's name
@@ -224,6 +243,9 @@ def search_for_file(self, dependency):  # type: (FileDependency) -> List[Package
                 )
             )
 
+        if dependency.base is not None:
+            package.root_dir = dependency.base
+
         package.source_url = dependency.path.as_posix()
         package.files = [
             {"file": dependency.path.name, "hash": "sha256:" + dependency.hash()}
@@ -270,15 +292,25 @@ def get_package_from_file(cls, file_path):  # type: (Path) -> Package
     def search_for_directory(
         self, dependency
     ):  # type: (DirectoryDependency) -> List[Package]
-        package = self.get_package_from_directory(
-            dependency.full_path, name=dependency.name
-        )
+        if dependency in self._deferred_cache:
+            dependency, _package = self._deferred_cache[dependency]
+
+            package = _package.clone()
+        else:
+            package = self.get_package_from_directory(
+                dependency.full_path, name=dependency.name
+            )
+
+            dependency._constraint = package.version
+            dependency._pretty_constraint = package.version.text
+
+            self._deferred_cache[dependency] = (dependency, package)
 
         package.source_url = dependency.path.as_posix()
         package.develop = dependency.develop
 
         if dependency.base is not None:
-            package.root_dir = dependency.base.as_posix()
+            package.root_dir = dependency.base
 
         for extra in dependency.extras:
             if extra in package.extras:
@@ -434,6 +466,9 @@ def get_package_from_directory(
         return package
 
     def search_for_url(self, dependency):  # type: (URLDependency) -> List[Package]
+        if dependency in self._deferred_cache:
+            return [self._deferred_cache[dependency]]
+
         package = self.get_package_from_url(dependency.url)
 
         if dependency.name != package.name:
@@ -451,6 +486,11 @@ def search_for_url(self, dependency):  # type: (URLDependency) -> List[Package]
 
                 package.requires += package.extras[extra]
 
+        dependency._constraint = package.version
+        dependency._pretty_constraint = package.version.text
+
+        self._deferred_cache[dependency] = package
+
         return [package]
 
     @classmethod
@@ -551,6 +591,17 @@ def complete_package(
         else:
             requires = package.requires
 
+        # Retrieving constraints for deferred dependencies
+        for r in requires:
+            if r.is_directory():
+                self.search_for_directory(r)
+            elif r.is_file():
+                self.search_for_file(r)
+            elif r.is_vcs():
+                self.search_for_vcs(r)
+            elif r.is_url():
+                self.search_for_url(r)
+
         dependencies = [
             r
             for r in requires
@@ -696,15 +747,15 @@ def complete_package(
             if (package.dependency.is_directory() or package.dependency.is_file()) and (
                 dep.is_directory() or dep.is_file()
             ):
-                if dep.path.as_posix().startswith(package.source_url):
-                    relative = (Path(package.source_url) / dep.path).relative_to(
-                        package.source_url
+                relative_path = Path(
+                    os.path.relpath(
+                        dep.full_path.as_posix(), package.root_dir.as_posix()
                     )
-                else:
-                    relative = Path(package.source_url) / dep.path
+                )
 
                 # TODO: Improve the way we set the correct relative path for dependencies
-                dep._path = relative
+                dep._path = relative_path
+
             clean_dependencies.append(dep)
 
         package.requires = clean_dependencies

tests/fixtures/directory/project_with_transitive_directory_dependencies/pyproject.toml

@@ -8,5 +8,6 @@ license = "MIT"
 [tool.poetry.dependencies]
 python = "*"
 project-with-extras = {path = "../../project_with_extras/"}
+project-with-transitive-file-dependencies = {path = "../project_with_transitive_file_dependencies/"}
 
 [tool.poetry.dev-dependencies]

tests/fixtures/directory/project_with_transitive_file_dependencies/inner-directory-project/pyproject.toml

@@ -0,0 +1,11 @@
+[tool.poetry]
+name = "inner-directory-project"
+version = "1.2.4"
+description = "This is a description"
+authors = ["Your Name <[email protected]>"]
+license = "MIT"
+
+[tool.poetry.dependencies]
+python = "*"
+
+[tool.poetry.dev-dependencies]

tests/fixtures/directory/project_with_transitive_file_dependencies/pyproject.toml

@@ -8,5 +8,6 @@ license = "MIT"
 [tool.poetry.dependencies]
 python = "*"
 demo = {path = "../../distributions/demo-0.1.0-py2.py3-none-any.whl"}
+inner-directory-project = {path = "./inner-directory-project"}
 
 [tool.poetry.dev-dependencies]