Skip to content

Conversation

sentrivana
Copy link
Contributor

@sentrivana sentrivana commented Sep 24, 2025

Description

Most of the merge conflicts concerning tox.ini come from the timestamp of the last update. If two PRs regenerate tox.ini, they'll be guaranteed to have a merge conflict that needs to be resolved by hand. This is time consuming and unnecessary.

We still need some way of figuring out when the file was last updated. This is important for checking unwanted edits to tox.ini (instead of to the template it's generated from). In order to check for them, we need to regenerate the file on the current branch and compare it to the committed version. However, if there have been new package versions in the meantime, these would then pop up in the diff. One solution is to regenerate the file ignoring any new releases after the last update, which is what we were using the last updated timestamp for.

In this PR, we simply figure out the timestamp from git history, removing the need for storing it explicitly anywhere.

Issues

Reminders

@sentrivana sentrivana changed the title feat(toxgen): Remove merge conflict prone last updated timestamp feat(toxgen): Remove merge conflict prone timestamp Sep 24, 2025
@sentrivana sentrivana changed the title feat(toxgen): Remove merge conflict prone timestamp feat(toxgen): Remove timestamp prone to merge conflicts Sep 24, 2025
@sentrivana sentrivana marked this pull request as ready for review September 24, 2025 13:24
@sentrivana sentrivana requested a review from a team as a code owner September 24, 2025 13:24
@sentrivana sentrivana merged commit b7780ba into master Sep 24, 2025
113 checks passed
@sentrivana sentrivana deleted the ivana/toxgen/no-timestamp branch September 24, 2025 14:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants