feat(toxgen): Remove timestamp prone to merge conflicts #4860
+27
−34
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Most of the merge conflicts concerning
tox.ini
come from the timestamp of the last update. If two PRs regeneratetox.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
tox -e linters
.feat:
,fix:
,ref:
,meta:
)