Add support for extra variants of relative urls for simple html pypi API (#174)

artem-samokhin · pre-commit-ci[bot] · web-flow · commit 5ce6e1f26f06 · 2025-01-21T20:43:01.000+09:00
* Add support for extra variants of relative urls for simple html pypi API * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * changelog & code review * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Fixed
+
+- Fix a bug that prevented non-standard relative urls to be treated as such
+  (the ones that starts with `../` or `./`)
+  [#174](https://github.com/pyodide/micropip/pull/174)
+
 ## [0.8.0] - 2024/12/15
 
 ### Added
diff --git a/micropip/package_index.py b/micropip/package_index.py
@@ -7,7 +7,7 @@
 from dataclasses import dataclass
 from functools import partial
 from typing import Any
-from urllib.parse import urlparse, urlunparse
+from urllib.parse import urljoin, urlparse, urlunparse
 
 from packaging.utils import InvalidWheelFilename
 from packaging.version import InvalidVersion, Version
@@ -130,8 +130,10 @@ def _parse_pep691_response(
                 version = parse_version(filename)
             except (InvalidVersion, InvalidWheelFilename):
                 continue
-            if file["url"].startswith("/"):
-                file["url"] = index_base_url + file["url"]
+
+            is_absolute_url = bool(urlparse(file["url"]).netloc)
+            if not is_absolute_url:
+                file["url"] = urljoin(index_base_url, file["url"])
 
             releases[version].append(file)
 
diff --git a/tests/test_data/pypi_response/relative-urls-test_simple.html b/tests/test_data/pypi_response/relative-urls-test_simple.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta name="pypi:repository-version" content="1.1">
+    <title>Links for relative-url-test</title>
+</head>
+<body>
+<h1>Links for relative-url-test</h1>
+<a href="../../packages/relative-url-test/1.0.0/relative_url_test-1.0.0.tar.gz#sha256=aed8c5ebf0320f526d1550f1754afa69ebc20855224fc5a02a3d74fababd9fa4" data-requires-python="&gt;=3.6">relative_url_test-1.0.0.tar.gz</a>
+<a href="../../packages/relative-url-test/1.0.0/relative_url_test-1.0.0-py3-none-any.whl#sha256=f4a7ba72e93bc97ff491b66d69063819ae2b75238bb653cd4c95e3f2847ce76e" data-requires-python="&gt;=3.6">relative_url_test-1.0.0-py3-none-any.whl</a>
+<a href="../packages/relative-url-test/1.1.0/relative_url_test-1.1.0.tar.gz#sha256=bed8c5ebf0320f526d1550f1754afa69ebc20855224fc5a02a3d74fababd9fa5" data-requires-python="&gt;=3.6">relative_url_test-1.1.0.tar.gz</a>
+<a href="../packages/relative-url-test/1.1.0/relative_url_test-1.1.0-py3-none-any.whl#sha256=c8e1716e83cc398ae16824e5572ae04e0d9fc2c6b985fb0f900f5f0c96ecba1a" data-requires-python="&gt;=3.6">relative_url_test-1.1.0-py3-none-any.whl</a>
+<a href="./packages/relative-url-test/1.2.0/relative_url_test-1.2.0-py3-none-any.whl#sha256=d8e1716e83cc398ae16824e5572ae04e0d9fc2c6b985fb0f900f5f0c96ecba1b" data-requires-python="&gt;=3.6">relative_url_test-1.2.0-py3-none-any.whl</a>
+<a href="/packages/relative-url-test/1.3.0/relative_url_test-1.3.0-py3-none-any.whl#sha256=e8e1716e83cc398ae16824e5572ae04e0d9fc2c6b985fb0f900f5f0c96ecba1c" data-requires-python="&gt;=3.6">relative_url_test-1.3.0-py3-none-any.whl</a>
+<a href="packages/relative-url-test/1.4.0/relative_url_test-1.4.0-py3-none-any.whl#sha256=f8e1716e83cc398ae16824e5572ae04e0d9fc2c6b985fb0f900f5f0c96ecba1d" data-requires-python="&gt;=3.6">relative_url_test-1.4.0-py3-none-any.whl</a>
+</body>
+</html>
diff --git a/tests/test_package_index.py b/tests/test_package_index.py
@@ -43,7 +43,8 @@ def test_project_info_from_simple_json(name):
 
 
 @pytest.mark.parametrize(
-    "name", ["numpy", "black", "pytest", "snowballstemmer", "pytz"]
+    "name",
+    ["numpy", "black", "pytest", "snowballstemmer", "pytz", "relative-urls-test"],
 )
 def test_project_info_from_simple_html(name):
     test_file = TEST_PYPI_RESPONSE_DIR / f"{name}_simple.html"

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,8 @@ def test_project_info_from_simple_json(name):`
`43`	`43`
`44`	`44`
`45`	`45`	`@pytest.mark.parametrize(`
`46`		`- "name", ["numpy", "black", "pytest", "snowballstemmer", "pytz"]`
	`46`	`+ "name",`
	`47`	`+ ["numpy", "black", "pytest", "snowballstemmer", "pytz", "relative-urls-test"],`
`47`	`48`	`)`
`48`	`49`	`def test_project_info_from_simple_html(name):`
`49`	`50`	`test_file = TEST_PYPI_RESPONSE_DIR / f"{name}_simple.html"`