Allow full path in PyPI upstream source URL
Users can now configure the full path including /simple in their upstream source URL (e.g., https://example.com/api/pypi/repo/simple) instead of having the code append /simple/ automatically. This matches pip's --index-url format, making configuration more intuitive and copy/paste friendly.
This commit is contained in:
@@ -180,7 +180,8 @@ async def pypi_simple_index(
|
|||||||
headers.update(_build_auth_headers(source))
|
headers.update(_build_auth_headers(source))
|
||||||
auth = _get_basic_auth(source)
|
auth = _get_basic_auth(source)
|
||||||
|
|
||||||
simple_url = source.url.rstrip('/') + '/simple/'
|
# Use URL as-is - users should provide full path including /simple
|
||||||
|
simple_url = source.url.rstrip('/') + '/'
|
||||||
|
|
||||||
timeout = httpx.Timeout(PROXY_READ_TIMEOUT, connect=PROXY_CONNECT_TIMEOUT)
|
timeout = httpx.Timeout(PROXY_READ_TIMEOUT, connect=PROXY_CONNECT_TIMEOUT)
|
||||||
|
|
||||||
@@ -268,7 +269,8 @@ async def pypi_package_versions(
|
|||||||
headers.update(_build_auth_headers(source))
|
headers.update(_build_auth_headers(source))
|
||||||
auth = _get_basic_auth(source)
|
auth = _get_basic_auth(source)
|
||||||
|
|
||||||
package_url = source.url.rstrip('/') + f'/simple/{normalized_name}/'
|
# Use URL as-is - users should provide full path including /simple
|
||||||
|
package_url = source.url.rstrip('/') + f'/{normalized_name}/'
|
||||||
final_url = package_url # Track final URL after redirects
|
final_url = package_url # Track final URL after redirects
|
||||||
|
|
||||||
timeout = httpx.Timeout(PROXY_READ_TIMEOUT, connect=PROXY_CONNECT_TIMEOUT)
|
timeout = httpx.Timeout(PROXY_READ_TIMEOUT, connect=PROXY_CONNECT_TIMEOUT)
|
||||||
|
|||||||
Reference in New Issue
Block a user