Skip to content

Commit

Permalink
Fix grammar
Browse files Browse the repository at this point in the history
  • Loading branch information
charliermarsh committed Jul 22, 2024
1 parent 7b894d0 commit 9e55542
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 34 deletions.
3 changes: 1 addition & 2 deletions crates/uv-resolver/src/version_map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ use tracing::instrument;
use distribution_filename::{DistFilename, WheelFilename};
use distribution_types::{
HashComparison, IncompatibleSource, IncompatibleWheel, IndexUrl, PrioritizedDist,
PythonRequirementKind, RegistryBuiltWheel, RegistrySourceDist, SourceDistCompatibility,
WheelCompatibility,
RegistryBuiltWheel, RegistrySourceDist, SourceDistCompatibility, WheelCompatibility,
};
use pep440_rs::Version;
use platform_tags::{IncompatibleTag, TagCompatibility, Tags};
Expand Down
42 changes: 10 additions & 32 deletions crates/uv/tests/lock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4268,8 +4268,6 @@ fn lock_resolution_mode() -> Result<()> {
fn lock_requires_python_no_wheels() -> Result<()> {
let context = TestContext::new("3.12");

let lockfile = context.temp_dir.join("uv.lock");

let pyproject_toml = context.temp_dir.child("pyproject.toml");
pyproject_toml.write_str(
r#"
Expand All @@ -4281,37 +4279,17 @@ fn lock_requires_python_no_wheels() -> Result<()> {
"#,
)?;

deterministic! { context =>
uv_snapshot!(context.filters(), context.lock(), @r###"
success: true
exit_code: 0
----- stdout -----
----- stderr -----
warning: `uv lock` is experimental and may change without warning
Resolved 6 packages in [TIME]
"###);

let lock = fs_err::read_to_string(&lockfile).unwrap();
uv_snapshot!(context.filters(), context.lock(), @r###"
success: false
exit_code: 1
----- stdout -----
insta::with_settings!({
filters => context.filters(),
}, {
assert_snapshot!(
lock, @r###"
success: false
exit_code: 1
----- stdout -----
----- stderr -----
warning: `uv lock` is experimental and may change without warning
× No solution found when resolving dependencies:
╰─▶ Because dearpygui==1.9.1 has no wheels are available with a matching Python ABI and project==0.1.0 depends on dearpygui==1.9.1, we can conclude that project==0.1.0 cannot be used.
And because only project==0.1.0 is available and you require project, we can conclude that the requirements are unsatisfiable.
"###
);
});
}
----- stderr -----
warning: `uv lock` is experimental and may change without warning
× No solution found when resolving dependencies:
╰─▶ Because dearpygui==1.9.1 has no wheels with a matching Python ABI and project==0.1.0 depends on dearpygui==1.9.1, we can conclude that project==0.1.0 cannot be used.
And because only project==0.1.0 is available and you require project, we can conclude that the requirements are unsatisfiable.
"###);

Ok(())
}

0 comments on commit 9e55542

Please sign in to comment.