fix e2e test

python-wheel-build · Jul 19, 2024 · 6ba4bae · 6ba4bae
1 parent 25fad92
commit 6ba4bae
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/e2e/build_settings.yaml b/e2e/build_settings.yaml
@@ -1,9 +1,9 @@
 packages:
   stevedore:
     download_source:
-      url: "https://files.pythonhosted.org/packages/e7/c1/b210bf1071c96ecfcd24c2eeb4c828a2a24bf74b38af13896d02203b1eec/stevedore-{version}.tar.gz"
-      destination_filename: "stevedore-{version}.tar.gz"
-    resolve_dist:
+      url: https://files.pythonhosted.org/packages/e7/c1/b210bf1071c96ecfcd24c2eeb4c828a2a24bf74b38af13896d02203b1eec/stevedore-${version}.tar.gz
+      destination_filename: stevedore-custom-${version}.tar.gz
+    resolver_dist:
       sdist_server_url: "https://pypi.org/simple"
       include_sdist: false
       include_wheels: true
diff --git a/e2e/test_build_settings.sh b/e2e/test_build_settings.sh
@@ -52,7 +52,7 @@ fromager \
 
 EXPECTED_FILES="
 wheels-repo/build/stevedore-5.2.0-py3-none-any.whl
-sdists-repo/downloads/stevedore-5.2.0.tar.gz
+sdists-repo/downloads/stevedore-custom-5.2.0.tar.gz
 sdists-repo/builds/stevedore-5.2.0.tar.gz
 sdists-repo/builds/test-output-file.txt
 build.log

diff --git a/src/fromager/sources.py b/src/fromager/sources.py
@@ -154,7 +154,7 @@ def default_download_source(
     dest_filename_template = ctx.settings.download_source_destination_filename(req.name)
     destination_filename = _resolve_template(dest_filename_template, req, version)
     url_template = ctx.settings.download_source_url(req.name, org_url)
-    url = _resolve_template(url_template, req, version) or org_url
+    url = _resolve_template(url_template, req, version)
     logger.debug(f"{req.name}: using {url} instead of {org_url}")
 
     source_filename = _download_source_check(