Improve support for PEP-440 direct references

With this change we allow for PEP-508 string for file dependencies
to use PEP-440 direct reference using the file URI scheme (RFC-8089).

Note that this implementation will not allow non RFC-8089 file path
references. In order to allow for sdist to be portable in sane use
cases, we ensure that relative path dependencies do not use the
file URI scheme, but preserve path if relative or directories.

In addition to file resource, directory dependencies now support
the same scheme.

References:
- https://www.python.org/dev/peps/pep-0508/#backwards-compatibility
- https://www.python.org/dev/peps/pep-0440/#direct-references
- https://tools.ietf.org/html/rfc8089
- https://discuss.python.org/t/what-is-the-correct-interpretation-of-path-based-pep-508-uri-reference/2815/11

poetry/core/masonry/builders/complete.py

@@ -38,14 +38,12 @@ def build(self):
 
                 with self.unpacked_tarball(sdist_file) as tmpdir:
                     WheelBuilder.make_in(
-                        Factory().create_poetry(tmpdir),
-                        dist_dir,
-                        original=self._poetry,
+                        Factory().create_poetry(tmpdir), dist_dir, original=self._poetry
                     )
         else:
             with self.unpacked_tarball(sdist_file) as tmpdir:
                 WheelBuilder.make_in(
-                    Factory().create_poetry(tmpdir), dist_dir, original=self._poetry,
+                    Factory().create_poetry(tmpdir), dist_dir, original=self._poetry
                 )
 
     @classmethod

poetry/core/packages/__init__.py

@@ -1,7 +1,12 @@
 import os
 import re
 
+from typing import Optional
+from typing import Union
+
 from poetry.core.semver import Version
+from poetry.core.semver import parse_constraint
+from poetry.core.utils._compat import Path
 from poetry.core.utils.patterns import wheel_file_re
 from poetry.core.version.requirements import Requirement
 
@@ -19,10 +24,38 @@
 from .utils.utils import is_url
 from .utils.utils import path_to_url
 from .utils.utils import strip_extras
+from .utils.utils import url_to_path
 from .vcs_dependency import VCSDependency
 
 
-def dependency_from_pep_508(name):
+def _make_file_or_dir_dep(
+    name, path, base=None
+):  # type: (str, Path, Optional[Path]) -> Optional[Union[FileDependency, DirectoryDependency]]
+    """
+    Helper function to create a file or directoru dependency with the given arguments. If
+    path is not a file or directory that exists, `None` is returned.
+    """
+    _path = path
+    if not path.is_absolute() and base:
+        # a base path was specified, so we should respect that
+        _path = Path(base) / path
+
+    if _path.is_file():
+        return FileDependency(name, path, base=base)
+    elif _path.is_dir():
+        return DirectoryDependency(name, path, base=base)
+
+    return None
+
+
+def dependency_from_pep_508(
+    name, relative_to=None
+):  # type: (str, Optional[Path]) -> Dependency
+    """
+    Resolve a PEP-508 requirement string to a `Dependency` instance. If a `relative_to`
+    path is specified, this is used as the base directory if the identified dependency is
+    of file or directory type.
+    """
     from poetry.core.vcs.git import ParsedUrl
 
     # Removing comments
@@ -63,30 +96,53 @@ def dependency_from_pep_508(name):
 
     # it's a local file, dir, or url
     if link:
+        is_file_uri = link.scheme == "file"
+        is_relative_uri = is_file_uri and re.search(r"\.\./", link.url)
+
         # Handle relative file URLs
-        if link.scheme == "file" and re.search(r"\.\./", link.url):
-            link = Link(path_to_url(os.path.normpath(os.path.abspath(link.path))))
+        if is_file_uri and is_relative_uri:
+            path = Path(link.path)
+            if relative_to:
+                path = relative_to / path
+            link = Link(path_to_url(path))
+
         # wheel file
+        version = None
         if link.is_wheel:
             m = wheel_file_re.match(link.filename)
             if not m:
                 raise ValueError("Invalid wheel name: {}".format(link.filename))
-
             name = m.group("name")
             version = m.group("ver")
-            dep = Dependency(name, version)
+
+        name = req.name or link.egg_fragment
+        dep = None
+
+        if link.scheme.startswith("git+"):
+            url = ParsedUrl.parse(link.url)
+            dep = VCSDependency(name, "git", url.url, rev=url.rev)
+        elif link.scheme == "git":
+            dep = VCSDependency(name, "git", link.url_without_fragment)
+        elif link.scheme in ["http", "https"]:
+            dep = URLDependency(name, link.url)
+        elif is_file_uri:
+            # handle RFC 8089 references
+            path = url_to_path(req.url)
+            dep = _make_file_or_dir_dep(name=name, path=path, base=relative_to)
         else:
-            name = req.name or link.egg_fragment
-
-            if link.scheme.startswith("git+"):
-                url = ParsedUrl.parse(link.url)
-                dep = VCSDependency(name, "git", url.url, rev=url.rev)
-            elif link.scheme == "git":
-                dep = VCSDependency(name, "git", link.url_without_fragment)
-            elif link.scheme in ["http", "https"]:
-                dep = URLDependency(name, link.url_without_fragment)
-            else:
-                dep = Dependency(name, "*")
+            try:
+                # this is a local path not using the file URI scheme
+                dep = _make_file_or_dir_dep(
+                    name=name, path=Path(req.url), base=relative_to
+                )
+            except ValueError:
+                pass
+
+        if dep is None:
+            dep = Dependency(name, version or "*")
+
+        if version:
+            dep._constraint = parse_constraint(version)
     else:
         if req.pretty_constraint:
             constraint = req.constraint

poetry/core/packages/directory_dependency.py

@@ -79,3 +79,14 @@ def supports_poetry(self):
 
     def is_directory(self):
         return True
+
+    @property
+    def base_pep_508_name(self):  # type: () -> str
+        requirement = self.pretty_name
+
+        if self.extras:
+            requirement += "[{}]".format(",".join(self.extras))
+
+        requirement += " @ {}".format(str(self.path))
+
+        return requirement

poetry/core/packages/file_dependency.py

@@ -4,6 +4,7 @@
 from poetry.core._vendor.pkginfo.distribution import HEADER_ATTRS
 from poetry.core._vendor.pkginfo.distribution import HEADER_ATTRS_2_0
 
+from poetry.core.packages.utils.utils import path_to_url
 from poetry.core.utils._compat import Path
 
 from .dependency import Dependency
@@ -59,3 +60,15 @@ def hash(self):
                 h.update(content)
 
         return h.hexdigest()
+
+    @property
+    def base_pep_508_name(self):  # type: () -> str
+        requirement = self.pretty_name
+
+        if self.extras:
+            requirement += "[{}]".format(",".join(self.extras))
+
+        path = path_to_url(self.path) if self.path.is_absolute() else self.path
+        requirement += " @ {}".format(path)
+
+        return requirement

poetry/core/packages/utils/utils.py

@@ -1,6 +1,13 @@
 import os
 import posixpath
 import re
+import sys
+
+from typing import Union
+
+from poetry.core._vendor.six.moves.urllib.parse import unquote  # noqa
+from poetry.core._vendor.six.moves.urllib.parse import urlsplit  # noqa
+from poetry.core._vendor.six.moves.urllib.request import url2pathname  # noqa
 
 from poetry.core.packages.constraints.constraint import Constraint
 from poetry.core.packages.constraints.multi_constraint import MultiConstraint
@@ -11,24 +18,13 @@
 from poetry.core.semver import VersionRange
 from poetry.core.semver import VersionUnion
 from poetry.core.semver import parse_constraint
+from poetry.core.utils._compat import Path
 from poetry.core.version.markers import BaseMarker
 from poetry.core.version.markers import MarkerUnion
 from poetry.core.version.markers import MultiMarker
 from poetry.core.version.markers import SingleMarker
 
 
-try:
-    import urllib.parse as urlparse
-except ImportError:
-    import urlparse
-
-
-try:
-    import urllib.request as urllib2
-except ImportError:
-    import urllib2
-
-
 BZ2_EXTENSIONS = (".tar.bz2", ".tbz")
 XZ_EXTENSIONS = (".tar.xz", ".txz", ".tlz", ".tar.lz", ".tar.lzma")
 ZIP_EXTENSIONS = (".zip", ".whl")
@@ -52,14 +48,38 @@
     pass
 
 
-def path_to_url(path):
+def path_to_url(path):  # type: (Union[str, Path]) -> str
     """
-    Convert a path to a file: URL.  The path will be made absolute and have
-    quoted path parts.
+    Convert a path to a file: URL.  The path will be made absolute unless otherwise
+    specified and have quoted path parts.
     """
-    path = os.path.normpath(os.path.abspath(path))
-    url = urlparse.urljoin("file:", urllib2.pathname2url(path))
-    return url
+    return Path(path).absolute().as_uri()
+
+
+def url_to_path(url):  # type: (str) -> Path
+    """
+    Convert an RFC8089 file URI to path.
+
+    The logic used here is borrowed from pip
+    https://github.com/pypa/pip/blob/4d1932fcdd1974c820ea60b3286984ebb0c3beaa/src/pip/_internal/utils/urls.py#L31
+    """
+    if not url.startswith("file:"):
+        raise ValueError("{} is not a valid file URI".format(url))
+
+    _, netloc, path, _, _ = urlsplit(url)
+
+    if not netloc or netloc == "localhost":
+        # According to RFC 8089, same as empty authority.
+        netloc = ""
+    elif netloc not in {".", ".."} and sys.platform == "win32":
+        # If we have a UNC path, prepend UNC share notation.
+        netloc = "\\\\" + netloc
+    else:
+        raise ValueError(
+            "non-local file URIs are not supported on this platform: {}".format(url)
+        )
+
+    return Path(url2pathname(netloc + unquote(path)))
 
 
 def is_url(name):

poetry/core/utils/_compat.py

@@ -1,10 +1,10 @@
 import sys
 
+import poetry.core._vendor.six.moves.urllib.parse as urllib_parse
+
+
+urlparse = urllib_parse
 
-try:
-    import urllib.parse as urlparse
-except ImportError:
-    import urlparse
 
 try:  # Python 2
     long = long

poetry/core/version/requirements.py

@@ -216,10 +216,14 @@ def __init__(self, requirement_string):
         self.name = req.name
         if req.url:
             parsed_url = urlparse.urlparse(req.url)
-            if not (parsed_url.scheme and parsed_url.netloc) or (
-                not parsed_url.scheme and not parsed_url.netloc
-            ):
-                raise InvalidRequirement("Invalid URL given")
+            if parsed_url.scheme == "file":
+                if urlparse.urlunparse(parsed_url) != req.url:
+                    raise InvalidRequirement("Invalid URL given")
+            elif (
+                not (parsed_url.scheme and parsed_url.netloc)
+                or (not parsed_url.scheme and not parsed_url.netloc)
+            ) and not parsed_url.path:
+                raise InvalidRequirement("Invalid URL: {0}".format(req.url))
             self.url = req.url
         else:
             self.url = None

tests/masonry/builders/test_builder.py

@@ -11,7 +11,7 @@ def test_builder_find_excluded_files(mocker):
     p.return_value = []
 
     builder = Builder(
-        Factory().create_poetry(Path(__file__).parent / "fixtures" / "complete"),
+        Factory().create_poetry(Path(__file__).parent / "fixtures" / "complete")
     )
 
     assert builder.find_excluded_files() == {"my_package/sub_pkg1/extra_file.xml"}
@@ -24,7 +24,7 @@ def test_builder_find_case_sensitive_excluded_files(mocker):
     builder = Builder(
         Factory().create_poetry(
             Path(__file__).parent / "fixtures" / "case_sensitive_exclusions"
-        ),
+        )
     )
 
     assert builder.find_excluded_files() == {
@@ -45,15 +45,15 @@ def test_builder_find_invalid_case_sensitive_excluded_files(mocker):
     builder = Builder(
         Factory().create_poetry(
             Path(__file__).parent / "fixtures" / "invalid_case_sensitive_exclusions"
-        ),
+        )
     )
 
     assert {"my_package/Bar/foo/bar/Foo.py"} == builder.find_excluded_files()
 
 
 def test_get_metadata_content():
     builder = Builder(
-        Factory().create_poetry(Path(__file__).parent / "fixtures" / "complete"),
+        Factory().create_poetry(Path(__file__).parent / "fixtures" / "complete")
     )
 
     metadata = builder.get_metadata_content()
@@ -103,7 +103,7 @@ def test_get_metadata_content():
 
 def test_metadata_homepage_default():
     builder = Builder(
-        Factory().create_poetry(Path(__file__).parent / "fixtures" / "simple_version"),
+        Factory().create_poetry(Path(__file__).parent / "fixtures" / "simple_version")
     )
 
     metadata = Parser().parsestr(builder.get_metadata_content())
@@ -115,7 +115,7 @@ def test_metadata_with_vcs_dependencies():
     builder = Builder(
         Factory().create_poetry(
             Path(__file__).parent / "fixtures" / "with_vcs_dependency"
-        ),
+        )
     )
 
     metadata = Parser().parsestr(builder.get_metadata_content())
@@ -129,7 +129,7 @@ def test_metadata_with_url_dependencies():
     builder = Builder(
         Factory().create_poetry(
             Path(__file__).parent / "fixtures" / "with_url_dependency"
-        ),
+        )
     )
 
     metadata = Parser().parsestr(builder.get_metadata_content())