Skip to content

Commit

Permalink
Merge branch 'main' into charlie/ver
Browse files Browse the repository at this point in the history
  • Loading branch information
charliermarsh committed Mar 7, 2024
2 parents 1bb74d2 + 438439c commit 8be3298
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion PIP_COMPATIBILITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ uv is designed as a drop-in replacement for common `pip` and `pip-tools` workflo

Informally, the intent is such that existing `pip` and `pip-tools` users can switch to uv without
making meaningful changes to their packaging workflows; and, in most cases, swapping out
`pip install` for `uv install` should "just work".
`pip install` for `uv pip install` should "just work".

However, uv is _not_ intended to be an _exact_ clone of `pip`, and the further you stray from
common `pip` workflows, the more likely you are to encounter differences in behavior. In some cases,
Expand Down
18 changes: 10 additions & 8 deletions crates/install-wheel-rs/src/uninstall.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,17 @@ pub fn uninstall_wheel(dist_info: &Path) -> Result<Uninstall, Error> {
};

// Read the RECORD file.
let record_path = dist_info.join("RECORD");
let mut record_file = match fs::File::open(&record_path) {
Ok(record_file) => record_file,
Err(err) if err.kind() == std::io::ErrorKind::NotFound => {
return Err(Error::MissingRecord(record_path));
}
Err(err) => return Err(err.into()),
let record = {
let record_path = dist_info.join("RECORD");
let mut record_file = match fs::File::open(&record_path) {
Ok(record_file) => record_file,
Err(err) if err.kind() == std::io::ErrorKind::NotFound => {
return Err(Error::MissingRecord(record_path));
}
Err(err) => return Err(err.into()),
};
read_record_file(&mut record_file)?
};
let record = read_record_file(&mut record_file)?;

let mut file_count = 0usize;
let mut dir_count = 0usize;
Expand Down
1 change: 0 additions & 1 deletion crates/platform-tags/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ impl Tags {
/// Tags are prioritized based on their position in the given vector. Specifically, tags that
/// appear earlier in the vector are given higher priority than tags that appear later.
pub fn new(tags: Vec<(String, String, String)>) -> Self {
println!("{tags:#?}");
let mut map = FxHashMap::default();
for (index, (py, abi, platform)) in tags.into_iter().rev().enumerate() {
map.entry(py.to_string())
Expand Down

0 comments on commit 8be3298

Please sign in to comment.