Skip to content

Use consistent PyPI cache bucket #7443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
charliermarsh merged 1 commit into from
Sep 16, 2024
Merged

Use consistent PyPI cache bucket #7443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions crates/uv-resolver/src/lock/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1863,7 +1863,7 @@ impl Package {
url: FileLocation::AbsoluteUrl(file_url.clone()),
yanked: None,
});
let index = IndexUrl::Url(VerbatimUrl::from_url(url.to_url()));
let index = IndexUrl::from(VerbatimUrl::from_url(url.to_url()));

let reg_dist = RegistrySourceDist {
name: self.id.name.clone(),
Expand Down Expand Up @@ -1905,7 +1905,7 @@ impl Package {
url: FileLocation::AbsoluteUrl(UrlString::from(file_url)),
yanked: None,
});
let index = IndexUrl::Path(
let index = IndexUrl::from(
VerbatimUrl::from_absolute_path(workspace_root.join(path))
.map_err(LockErrorKind::RegistryVerbatimUrl)?,
);
Expand Down Expand Up @@ -3284,7 +3284,7 @@ impl Wheel {
url: FileLocation::AbsoluteUrl(file_url.clone()),
yanked: None,
});
let index = IndexUrl::Url(VerbatimUrl::from_url(index_url.to_url()));
let index = IndexUrl::from(VerbatimUrl::from_url(index_url.to_url()));
Ok(RegistryBuiltWheel {
filename,
file,
Expand Down Expand Up @@ -3314,7 +3314,7 @@ impl Wheel {
url: FileLocation::AbsoluteUrl(UrlString::from(file_url)),
yanked: None,
});
let index = IndexUrl::Path(
let index = IndexUrl::from(
VerbatimUrl::from_absolute_path(root.join(index_path))
.map_err(LockErrorKind::RegistryVerbatimUrl)?,
);
Expand Down
5 changes: 1 addition & 4 deletions crates/uv/tests/run.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ fn run_with_python_version() -> Result<()> {
Removed virtual environment at: .venv
Creating virtualenv at: .venv
Resolved 5 packages in [TIME]
Prepared 3 packages in [TIME]
Prepared 1 package in [TIME]
Installed 4 packages in [TIME]
+ anyio==3.6.0
+ foo==1.0.0 (from file://[TEMP_DIR]/)
Expand Down Expand Up @@ -1186,7 +1186,6 @@ fn run_requirements_txt() -> Result<()> {
Resolved 6 packages in [TIME]
Audited 4 packages in [TIME]
Resolved 2 packages in [TIME]
Prepared 1 package in [TIME]
Installed 2 packages in [TIME]
+ iniconfig==2.0.0
+ sniffio==1.3.1
Expand Down Expand Up @@ -1484,7 +1483,6 @@ fn run_isolated_python_version() -> Result<()> {

----- stderr -----
Resolved 6 packages in [TIME]
Prepared 5 packages in [TIME]
Installed 6 packages in [TIME]
+ anyio==4.3.0
+ exceptiongroup==1.2.0
Expand All @@ -1508,7 +1506,6 @@ fn run_isolated_python_version() -> Result<()> {

----- stderr -----
Resolved 6 packages in [TIME]
Prepared 3 packages in [TIME]
Installed 4 packages in [TIME]
+ anyio==4.3.0
+ foo==1.0.0 (from file://[TEMP_DIR]/)
Expand Down
9 changes: 0 additions & 9 deletions crates/uv/tests/sync.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1007,7 +1007,6 @@ fn sync_dev() -> Result<()> {

----- stderr -----
Resolved 5 packages in [TIME]
Prepared 3 packages in [TIME]
Installed 3 packages in [TIME]
+ anyio==4.3.0
+ idna==3.6
Expand Down Expand Up @@ -1191,7 +1190,6 @@ fn no_install_workspace() -> Result<()> {
----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Creating virtualenv at: .venv
Prepared 4 packages in [TIME]
Installed 4 packages in [TIME]
+ anyio==3.7.0
+ idna==3.6
Expand Down Expand Up @@ -1656,7 +1654,6 @@ fn sync_custom_environment_path() -> Result<()> {
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Creating virtualenv at: foo
Resolved 2 packages in [TIME]
Prepared 1 package in [TIME]
Installed 1 package in [TIME]
+ iniconfig==2.0.0
"###);
Expand All @@ -1682,7 +1679,6 @@ fn sync_custom_environment_path() -> Result<()> {
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Creating virtualenv at: foobar/.venv
Resolved 2 packages in [TIME]
Prepared 1 package in [TIME]
Installed 1 package in [TIME]
+ iniconfig==2.0.0
"###);
Expand All @@ -1708,7 +1704,6 @@ fn sync_custom_environment_path() -> Result<()> {
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Creating virtualenv at: bar
Resolved 2 packages in [TIME]
Prepared 1 package in [TIME]
Installed 1 package in [TIME]
+ iniconfig==2.0.0
"###);
Expand All @@ -1730,7 +1725,6 @@ fn sync_custom_environment_path() -> Result<()> {
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Creating virtualenv at: [OTHER_TEMPDIR]/.venv
Resolved 2 packages in [TIME]
Prepared 1 package in [TIME]
Installed 1 package in [TIME]
+ iniconfig==2.0.0
"###);
Expand Down Expand Up @@ -1811,7 +1805,6 @@ fn sync_workspace_custom_environment_path() -> Result<()> {
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Creating virtualenv at: foo
Resolved 3 packages in [TIME]
Prepared 1 package in [TIME]
Installed 1 package in [TIME]
+ iniconfig==2.0.0
"###);
Expand Down Expand Up @@ -1968,7 +1961,6 @@ fn sync_virtual_env_warning() -> Result<()> {
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Creating virtualenv at: foo
Resolved 2 packages in [TIME]
Prepared 1 package in [TIME]
Installed 1 package in [TIME]
+ iniconfig==2.0.0
"###);
Expand All @@ -1984,7 +1976,6 @@ fn sync_virtual_env_warning() -> Result<()> {
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Creating virtualenv at: bar
Resolved 2 packages in [TIME]
Prepared 1 package in [TIME]
Installed 1 package in [TIME]
+ iniconfig==2.0.0
"###);
Expand Down
1 change: 0 additions & 1 deletion crates/uv/tests/workspace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,6 @@ fn test_uv_run_isolate() -> Result<()> {

----- stderr -----
Resolved 8 packages in [TIME]
Prepared 3 packages in [TIME]
Installed 5 packages in [TIME]
+ anyio==4.3.0
+ bird-feeder==1.0.0 (from file://[TEMP_DIR]/albatross-root-workspace/packages/bird-feeder)
Expand Down