Added test to fail pep508

Author: retpolanne

news/6202.bugfix

@@ -0,0 +1,2 @@
+Fix requirement line parser to correctly handle PEP 440 requirements with a URL
+pointing to an archive file.

src/pip/_internal/req/constructors.py

@@ -20,7 +20,9 @@
 from pip._vendor.packaging.specifiers import Specifier
 from pip._vendor.pkg_resources import RequirementParseError, parse_requirements
 
-from pip._internal.download import is_archive_file, is_url, url_to_path
+from pip._internal.download import (
+    is_archive_file, is_url, path_to_url, url_to_path,
+)
 from pip._internal.exceptions import InstallationError
 from pip._internal.models.index import PyPI, TestPyPI
 from pip._internal.models.link import Link
@@ -201,6 +203,58 @@ def install_req_from_editable(
     )
 
 
+def _get_path_or_url(path, name):
+    # type: (str, str) -> str
+    """
+    First, it checks whether a provided path is an installable directory
+    (e.g. it has a setup.py). If it is, returns the path.
+
+    If false, check if the path is an archive file (such as a .whl).
+    The function checks if the path is a file. If false, if the path has
+    an @, it will treat it as a PEP 440 URL requirement and return the path.
+    """
+    if os.path.isdir(path) and _looks_like_path(name):
+        if not is_installable_dir(path):
+            raise InstallationError(
+                "Directory %r is not installable. Neither 'setup.py' "
+                "nor 'pyproject.toml' found." % name
+            )
+        return path_to_url(path)
+    elif is_archive_file(path):
+        if os.path.isfile(path):
+            return path_to_url(path)
+        else:
+            urlreq_parts = name.split('@', 1)
+            if len(urlreq_parts) < 2 or _looks_like_path(urlreq_parts[0]):
+                logger.warning(
+                    'Requirement %r looks like a filename, but the '
+                    'file does not exist',
+                    name
+                )
+                return path_to_url(path)
+            # If the path contains '@' and the part before it does not look
+            # like a path, try to treat it as a PEP 440 URL req instead.
+
+
+def _looks_like_path(name):
+    # type: (str) -> bool
+    """Checks whether the string "looks like" a path on the filesystem.
+
+    This does not check whether the target actually exists, only judge from the
+    apperance. Returns true if any of the following is true:
+
+    * A path separator is found (either os.path.sep or os.path.altsep).
+    * The string starts with "." (current directory).
+    """
+    if os.path.sep in name:
+        return True
+    if os.path.altsep is not None and os.path.altsep in name:
+        return True
+    if name.startswith('.'):
+        return True
+    return False
+
+
 def install_req_from_line(
     name,  # type: str
     comes_from=None,  # type: Optional[Union[str, InstallRequirement]]
@@ -241,26 +295,9 @@ def install_req_from_line(
         link = Link(name)
     else:
         p, extras_as_string = _strip_extras(path)
-        looks_like_dir = os.path.isdir(p) and (
-            os.path.sep in name or
-            (os.path.altsep is not None and os.path.altsep in name) or
-            name.startswith('.')
-        )
-        if looks_like_dir:
-            if not is_installable_dir(p):
-                raise InstallationError(
-                    "Directory %r is not installable. Neither 'setup.py' "
-                    "nor 'pyproject.toml' found." % name
-                )
-            link = Link(path_to_url(p))
-        elif is_archive_file(p):
-            if not os.path.isfile(p):
-                logger.warning(
-                    'Requirement %r looks like a filename, but the '
-                    'file does not exist',
-                    name
-                )
-            link = Link(path_to_url(p))
+        path_or_url = _get_path_or_url(p, name)
+        if path_or_url:
+            link = Link(path_or_url)
 
     # it's a local file, dir, or url
     if link:

tests/unit/test_req.py

@@ -335,6 +335,33 @@ def test_url_with_query(self):
         req = install_req_from_line(url + fragment)
         assert req.link.url == url + fragment, req.link
 
+    def test_pep440_wheel_link_requirement(self):
+        url = 'https://whatever.com/test-0.4-py2.py3-bogus-any.whl'
+        line = 'test @ https://whatever.com/test-0.4-py2.py3-bogus-any.whl'
+        req = install_req_from_line(line)
+        parts = str(req.req).split('@', 1)
+        assert len(parts) == 2
+        assert parts[0].strip() == 'test'
+        assert parts[1].strip() == url
+
+    def test_pep440_url_link_requirement(self):
+        url = 'git+http://foo.com@ref#egg=foo'
+        line = 'foo @ git+http://foo.com@ref#egg=foo'
+        req = install_req_from_line(line)
+        parts = str(req.req).split('@', 1)
+        assert len(parts) == 2
+        assert parts[0].strip() == 'foo'
+        assert parts[1].strip() == url
+
+    def test_url_with_authentication_link_requirement(self):
+        url = 'https://[email protected]/test-0.4-py2.py3-bogus-any.whl'
+        line = 'https://[email protected]/test-0.4-py2.py3-bogus-any.whl'
+        req = install_req_from_line(line)
+        assert req.link is not None
+        assert req.link.is_wheel
+        assert req.link.scheme == "https"
+        assert req.link.url == url
+
     def test_unsupported_wheel_link_requirement_raises(self):
         reqset = RequirementSet()
         req = install_req_from_line(

tests/unit/test_req_file.py

@@ -225,6 +225,13 @@ def test_yield_line_requirement(self):
         req = install_req_from_line(line, comes_from=comes_from)
         assert repr(list(process_line(line, filename, 1))[0]) == repr(req)
 
+    def test_yield_pep440_line_requirement(self):
+        line = 'SomeProject @ https://url/SomeProject-py2-py3-none-any.whl'
+        filename = 'filename'
+        comes_from = '-r %s (line %s)' % (filename, 1)
+        req = install_req_from_line(line, comes_from=comes_from)
+        assert repr(list(process_line(line, filename, 1))[0]) == repr(req)
+
     def test_yield_line_constraint(self):
         line = 'SomeProject'
         filename = 'filename'