Strip fragments from direct source URLs in lockfile

crates/uv-resolver/src/lock/mod.rs

@@ -2280,14 +2280,14 @@ impl Source {
 
  fn from_direct_built_dist(direct_dist: &DirectUrlBuiltDist) -> Source {
  Source::Direct(
- UrlString::from(&direct_dist.url),
+ normalize_url(direct_dist.url.to_url()),
  DirectSource { subdirectory: None },
  )
  }
 
  fn from_direct_source_dist(direct_dist: &DirectUrlSourceDist) -> Source {
  Source::Direct(
- UrlString::from(&direct_dist.url),
+ normalize_url(direct_dist.url.to_url()),
  DirectSource {
  subdirectory: direct_dist
  .subdirectory

crates/uv/tests/lock.rs

@@ -12492,3 +12492,92 @@ fn lock_python_upper_bound() -> Result<()> {
 
  Ok(())
 }
+
+#[test]
+fn lock_strip_fragment() -> Result<()> {
+ let context = TestContext::new("3.12");
+
+ let pyproject_toml = context.temp_dir.child("pyproject.toml");
+ pyproject_toml.write_str(
+ r#"
+ [project]
+ name = "project"
+ version = "0.1.0"
+ requires-python = ">=3.12"
+ dependencies = ["iniconfig @ https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl#sha256=b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"]
+
+ [build-system]
+ requires = ["setuptools>=42"]
+ build-backend = "setuptools.build_meta"
+ "#,
+ )?;
+
+ uv_snapshot!(context.filters(), context.lock(), @r###"
+ success: true
+ exit_code: 0
+ ----- stdout -----
+
+ ----- stderr -----
+ Resolved 2 packages in [TIME]
+ "###);
+
+ let lock = fs_err::read_to_string(context.temp_dir.join("uv.lock")).unwrap();
+
+ insta::with_settings!({
+ filters => context.filters(),
+ }, {
+ assert_snapshot!(
+ lock, @r###"
+ version = 1
+ requires-python = ">=3.12"
+
+ [options]
+ exclude-newer = "2024-03-25T00:00:00Z"
+
+ [[package]]
+ name = "iniconfig"
+ version = "2.0.0"
+ source = { url = "https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl" }
+ wheels = [
+ { url = "https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374" },
+ ]
+
+ [[package]]
+ name = "project"
+ version = "0.1.0"
+ source = { editable = "." }
+ dependencies = [
+ { name = "iniconfig" },
+ ]
+
+ [package.metadata]
+ requires-dist = [{ name = "iniconfig", url = "https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl#sha256=b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374" }]
+ "###
+ );
+ });
+
+ // Re-run with `--locked`.
+ uv_snapshot!(context.filters(), context.lock().arg("--locked"), @r###"
+ success: true
+ exit_code: 0
+ ----- stdout -----
+
+ ----- stderr -----
+ Resolved 2 packages in [TIME]
+ "###);
+
+ // Install from the lockfile.
+ uv_snapshot!(context.filters(), context.sync().arg("--frozen"), @r###"
+ success: true
+ exit_code: 0
+ ----- stdout -----
+
+ ----- stderr -----
+ Prepared 2 packages in [TIME]
+ Installed 2 packages in [TIME]
+ + iniconfig==2.0.0 (from https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl)
+ + project==0.1.0 (from file://[TEMP_DIR]/)
+ "###);
+
+ Ok(())
+}