Skip to content
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.

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

Don't add duplicate files #2125

Merged
merged 1 commit into from
Jun 28, 2024
Merged

Conversation

konstin
Copy link
Member

@konstin konstin commented Jun 27, 2024

Add a file tracker for writing archives that checks that each path in the archive can't be added more than once. If the same file would be added twice, it's ignored the second time, if a different file would be added, it errors.

Fixes #2066
Fixes #2106

@konstin konstin added the bug Something isn't working label Jun 27, 2024
Add a file tracker for writing archives that checks that each path in the archive can't be added more than once. If the same file would be added twice, it's ignored the second time, if a different file would be added, it errors.

Fixes #2066
Fixes #2106
@konstin konstin force-pushed the konsti/dont-readd-files-and-validate branch from 4d75d87 to f34e4ab Compare June 27, 2024 17:44
Copy link

netlify bot commented Jun 27, 2024

Deploy Preview for maturin-guide ready!

Name Link
🔨 Latest commit 4d75d87
🔍 Latest deploy log https://app.netlify.com/sites/maturin-guide/deploys/667da4d3e233af00082f5ceb
😎 Deploy Preview https://deploy-preview-2125--maturin-guide.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@konstin konstin requested a review from messense June 27, 2024 17:44
Copy link

netlify bot commented Jun 27, 2024

Deploy Preview for maturin-guide ready!

Name Link
🔨 Latest commit f34e4ab
🔍 Latest deploy log https://app.netlify.com/sites/maturin-guide/deploys/667da4e1be836c000874fbe5
😎 Deploy Preview https://deploy-preview-2125--maturin-guide.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link
Member

@messense messense left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@messense messense added this pull request to the merge queue Jun 28, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 28, 2024
@messense messense added this pull request to the merge queue Jun 28, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 28, 2024
@messense messense added this pull request to the merge queue Jun 28, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 28, 2024
@konstin konstin added this pull request to the merge queue Jun 28, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 28, 2024
@konstin konstin added this pull request to the merge queue Jun 28, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 28, 2024
@konstin
Copy link
Member Author

konstin commented Jun 28, 2024

The conda test CI setup seems broken, but the regular tests are passing, merging manually

@konstin konstin merged commit 1291d90 into main Jun 28, 2024
28 checks passed
@konstin konstin deleted the konsti/dont-readd-files-and-validate branch June 28, 2024 11:40
ManonMarchand added a commit to cds-astro/mocpy that referenced this pull request Jul 8, 2024
netbsd-srcmastr pushed a commit to NetBSD/pkgsrc that referenced this pull request Jul 19, 2024
## [1.7.0] - 2024-07-07

* Initial iOS support in [#2101](PyO3/maturin#2102)
* Remove old import hook in [#2105](PyO3/maturin#2105), use [maturin-import-hook](https://github.com/PyO3/maturin-import-hook) instead
* Bump MSRV to 1.74.0 in [#2108](PyO3/maturin#2108)
* Add support for overriding wheel tag with `_PYTHON_HOST_PLATFORM` in [#2122](PyO3/maturin#2122)
* Don't add files to an archive more than once [#2125](PyO3/maturin#2125)
* Only use base python executable when `MATURIN_PEP517_USE_BASE_PYTHON` is set in [#2134](PyO3/maturin#2134)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
2 participants