always emit the url attribute

Author: chrisirhc

python/private/pypi/index_sources.bzl

@@ -32,7 +32,7 @@ def index_sources(line):
             * `marker` - str; the marker expression, as per PEP508 spec.
             * `requirement` - str; a requirement line without the marker. This can
                 be given to `pip` to install a package.
-            * `url` - str, optional; URL if the requirement specifies a direct URL.
+            * `url` - str; URL if the requirement specifies a direct URL, empty string otherwise.
     """
     line = line.replace("\\", " ")
     head, _, maybe_hashes = line.partition(";")
@@ -57,27 +57,17 @@ def index_sources(line):
         " ".join(["--hash=sha256:{}".format(sha) for sha in shas]),
     ).strip()
 
+    url = ""
     if "@" in head:
         requirement = requirement_line
-
-        _, _, url_and_rest = requirement.partition("@")
         _, _, url_and_rest = requirement.partition("@")
         url = url_and_rest.strip().partition(" ")[0].strip()
 
-        if url:
-            return struct(
-                requirement = requirement,
-                requirement_line = requirement_line,
-                version = version,
-                shas = sorted(shas),
-                marker = marker,
-                url = url,
-            )
-
     return struct(
         requirement = requirement,
         requirement_line = requirement_line,
         version = version,
         shas = sorted(shas),
         marker = marker,
+        url = url,
     )

python/private/pypi/parse_requirements.bzl

@@ -294,7 +294,7 @@ def _add_dists(*, requirement, index_urls, logger = None):
     """
 
     # Handle direct URLs in requirements
-    if hasattr(requirement.srcs, "url"):
+    if requirement.srcs.url:
         url = requirement.srcs.url
         _, _, filename = url.rpartition("/")
         direct_url_dist = struct(

tests/pypi/index_sources/index_sources_tests.bzl

@@ -24,6 +24,7 @@ def _test_no_simple_api_sources(env):
         "foo==0.0.1": struct(
             requirement = "foo==0.0.1",
             marker = "",
+            url = "",
         ),
         "foo==0.0.1 @ https://someurl.org": struct(
             requirement = "foo==0.0.1 @ https://someurl.org",
@@ -55,8 +56,7 @@ def _test_no_simple_api_sources(env):
         env.expect.that_str(got.requirement).equals(want.requirement)
         env.expect.that_str(got.requirement_line).equals(got.requirement)
         env.expect.that_str(got.marker).equals(want.marker)
-        if hasattr(want, "url"):
-            env.expect.that_str(got.url).equals(want.url)
+        env.expect.that_str(got.url).equals(want.url)
 
 _tests.append(_test_no_simple_api_sources)
 
@@ -70,6 +70,7 @@ def _test_simple_api_sources(env):
             marker = "",
             requirement = "foo==0.0.2",
             requirement_line = "foo==0.0.2 --hash=sha256:deafbeef --hash=sha256:deadbeef",
+            url = "",
         ),
         "foo[extra]==0.0.2; (python_version < 2.7 or extra == \"@\") --hash=sha256:deafbeef    --hash=sha256:deadbeef": struct(
             shas = [
@@ -79,6 +80,7 @@ def _test_simple_api_sources(env):
             marker = "(python_version < 2.7 or extra == \"@\")",
             requirement = "foo[extra]==0.0.2",
             requirement_line = "foo[extra]==0.0.2 --hash=sha256:deafbeef --hash=sha256:deadbeef",
+            url = "",
         ),
     }
     for input, want in tests.items():
@@ -88,6 +90,7 @@ def _test_simple_api_sources(env):
         env.expect.that_str(got.requirement).equals(want.requirement)
         env.expect.that_str(got.requirement_line).equals(want.requirement_line)
         env.expect.that_str(got.marker).equals(want.marker)
+        env.expect.that_str(got.url).equals(want.url)
 
 _tests.append(_test_simple_api_sources)
 

tests/pypi/parse_requirements/parse_requirements_tests.bzl

@@ -108,6 +108,7 @@ def _test_simple(env):
                     requirement_line = "foo[extra]==0.0.1 --hash=sha256:deadbeef",
                     shas = ["deadbeef"],
                     version = "0.0.1",
+                    url = "",
                 ),
                 target_platforms = [
                     "linux_x86_64",
@@ -228,6 +229,7 @@ def _test_extra_pip_args(env):
                     requirement_line = "foo[extra]==0.0.1 --hash=sha256:deadbeef",
                     shas = ["deadbeef"],
                     version = "0.0.1",
+                    url = "",
                 ),
                 target_platforms = [
                     "linux_x86_64",
@@ -265,6 +267,7 @@ def _test_dupe_requirements(env):
                     requirement_line = "foo[extra,extra_2]==0.0.1 --hash=sha256:deadbeef",
                     shas = ["deadbeef"],
                     version = "0.0.1",
+                    url = "",
                 ),
                 target_platforms = ["linux_x86_64"],
                 whls = [],
@@ -294,6 +297,7 @@ def _test_multi_os(env):
                     requirement_line = "bar==0.0.1 --hash=sha256:deadb00f",
                     shas = ["deadb00f"],
                     version = "0.0.1",
+                    url = "",
                 ),
                 target_platforms = ["windows_x86_64"],
                 whls = [],
@@ -311,6 +315,7 @@ def _test_multi_os(env):
                     requirement_line = "foo==0.0.3 --hash=sha256:deadbaaf",
                     shas = ["deadbaaf"],
                     version = "0.0.3",
+                    url = "",
                 ),
                 target_platforms = ["linux_x86_64"],
                 whls = [],
@@ -326,6 +331,7 @@ def _test_multi_os(env):
                     requirement_line = "foo[extra]==0.0.2 --hash=sha256:deadbeef",
                     shas = ["deadbeef"],
                     version = "0.0.2",
+                    url = "",
                 ),
                 target_platforms = ["windows_x86_64"],
                 whls = [],
@@ -365,6 +371,7 @@ def _test_multi_os_legacy(env):
                     requirement_line = "bar==0.0.1 --hash=sha256:deadb00f",
                     shas = ["deadb00f"],
                     version = "0.0.1",
+                    url = "",
                 ),
                 target_platforms = ["cp39_linux_x86_64"],
                 whls = [],
@@ -382,6 +389,7 @@ def _test_multi_os_legacy(env):
                     requirement_line = "foo==0.0.1 --hash=sha256:deadbeef",
                     shas = ["deadbeef"],
                     version = "0.0.1",
+                    url = "",
                 ),
                 target_platforms = ["cp39_linux_x86_64"],
                 whls = [],
@@ -397,6 +405,7 @@ def _test_multi_os_legacy(env):
                     requirement = "foo==0.0.3",
                     shas = ["deadbaaf"],
                     version = "0.0.3",
+                    url = "",
                 ),
                 target_platforms = ["cp39_osx_aarch64"],
                 whls = [],
@@ -450,6 +459,7 @@ def _test_env_marker_resolution(env):
                     requirement_line = "bar==0.0.1 --hash=sha256:deadbeef",
                     shas = ["deadbeef"],
                     version = "0.0.1",
+                    url = "",
                 ),
                 target_platforms = ["cp311_linux_super_exotic", "cp311_windows_x86_64"],
                 whls = [],
@@ -467,6 +477,7 @@ def _test_env_marker_resolution(env):
                     requirement_line = "foo[extra]==0.0.1 --hash=sha256:deadbeef",
                     shas = ["deadbeef"],
                     version = "0.0.1",
+                    url = "",
                 ),
                 target_platforms = ["cp311_windows_x86_64"],
                 whls = [],
@@ -502,6 +513,7 @@ def _test_different_package_version(env):
                     requirement_line = "foo==0.0.1 --hash=sha256:deadb00f",
                     shas = ["deadb00f"],
                     version = "0.0.1",
+                    url = "",
                 ),
                 target_platforms = ["linux_x86_64"],
                 whls = [],
@@ -517,6 +529,7 @@ def _test_different_package_version(env):
                     requirement_line = "foo==0.0.1+local --hash=sha256:deadbeef",
                     shas = ["deadbeef"],
                     version = "0.0.1+local",
+                    url = "",
                 ),
                 target_platforms = ["linux_x86_64"],
                 whls = [],