Do not consider optional sha checksum in url as basename, added test

Author: Zoran Simic

src/portable_python/__init__.py

@@ -498,6 +498,7 @@ def cfg_http_headers(self):
             for header_dict in config_http_headers:
                 for key, value in header_dict.items():
                     expanded_http_headers[os.path.expandvars(key)] = os.path.expandvars(value)
+
             return expanded_http_headers
 
     def cfg_url(self, version):
@@ -656,12 +657,13 @@ def compile(self):
 
                 # Some URL's may not end in file extension, such as with redirects.
                 # Github releases asset endpoint is this way .../releases/assets/48151
-                if not self.url.endswith((".zip", ".tar.gz")):
+
+                # Split on '#' for urls that include a checksum, such as #sha256=... fragment
+                basename = runez.basename(self.url, extension_marker="#")
+                if not basename.endswith((".zip", ".tar.gz")):
                     suffix = self.src_suffix or ".tar.gz"
-                    basename = f"{self.m_name}-{self.version}.{suffix}"
-                else:
-                    # Split on '#' for urls that include a checksum, such as #sha256=... fragment
-                    basename = runez.basename(self.url, extension_marker="#")
+                    suffix = ".%s" % (suffix.strip("."))  # Ensure it starts with a dot (in case config forgot leading dot)
+                    basename = f"{self.m_name}-{self.version}{suffix}"
 
                 path = self.setup.folders.sources / basename
                 if not path.exists():

tests/sample-config1.yml

@@ -40,3 +40,11 @@ cpython-pep668-externally-managed:
 
 cpython-configure:
   - --enable-shared
+
+# Exercise custom url
+bzip2-url: https://my-enterprise/.../assets/bzip2/123
+bzip2-version: 1.2.3
+bzip2-src-suffix: tar.gz  # Forgot leading dot on purpose
+bzip2-http-headers:
+  - Authorization: Bearer foo
+    Accept: application/octet-stream

tests/test_setup.py

@@ -9,8 +9,15 @@ def test_config(cli):
     with pytest.raises(runez.system.AbortException):
         PPG.config.parsed_yaml("a: b\ninvalid line", "testing")
 
+    # Exercise custom url in config
+    cli.run("-ntmacos-arm64", "-c", cli.tests_path("sample-config1.yml"), "build", "3.9.7", "-mbzip2")
+    assert cli.succeeded
+    assert "Would download https://my-enterprise/.../assets/bzip2/123" in cli.logged
+    assert "Would untar build/sources/bzip2-1.2.3.tar.gz -> build/components/bzip2" in cli.logged
+
     cli.run("-ntmacos-arm64", "-c", cli.tests_path("sample-config1.yml"), "build", "3.9.7", "-mnone")
     assert cli.succeeded
+
     assert " -mpip install --no-cache-dir --upgrade my-additional-package" in cli.logged
     assert "env MACOSX_DEPLOYMENT_TARGET=12" in cli.logged  # Comes from more specific macos-arm64.yml
     assert " -> dist/cpython-3.9.7-macos-arm64.tar.xz" in cli.logged  # Comes from macos.yml (not defined in macos-arm64.yml)