Merge pull request #2125 from PyO3/konsti/dont-readd-files-and-validate

Don't add duplicate files
PyO3 · Jun 28, 2024 · a7d8d3f · a7d8d3f
2 parents 1e77fde + f34e4ab
commit a7d8d3f
Show file tree

Hide file tree

Showing 9 changed files with 170 additions and 38 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -82,6 +82,7 @@ normpath = "1.1.1"
 path-slash = "0.2.1"
 pep440_rs = { version = "0.5.0", features = ["serde", "tracing"] }
 pep508_rs = { version = "0.4.2", features = ["serde", "tracing"] }
+same-file = "1.0.6"
 time = "0.3.17"
 url = "2.5.0"
 unicode-xid = { version = "0.2.4", optional = true }

diff --git a/Changelog.md b/Changelog.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased]
 
+* Don't add files to an archive more than once [#2125](https://github.com/PyO3/maturin/issues/2125)
+
 ## [1.6.0] - 2024-06-04
 
 * Detect compiling from Linux gnu to Linux musl as cross compiling in [#2010](https://github.com/PyO3/maturin/pull/2010)