chore: drop CHANGELOG.md again, and file #2's entry as a fragment - #8
Merged
Merged
Conversation
#2 was rebased onto main by restoring CHANGELOG.md, which #6 had replaced with CHANGELOG.rst. Three things followed from that: - main carried two changelogs, and the .md one was the copy from #2's merge base — so it had lost the whole 0.2.2 section (the rectangle widget, the text labels, the readout, the anyplotlib 0.10.0 floor). CHANGELOG.rst still has it. - #2's own entry went into the dead file instead of a fragment, so the next release notes would not have mentioned it: `towncrier build --draft` listed only #7 and the towncrier setup itself. - The link refs at the foot of the .md still pointed at v0.2.1...HEAD. The fix is the resolution the rebase wanted: CHANGELOG.md stays deleted, and #2's paragraph becomes upcoming_changes/2.bugfix.rst.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
#2 was rebased onto main by restoring
CHANGELOG.md, which #6 had replacedwith
CHANGELOG.rst. The code in #2 is untouched and correct — this is onlyabout the conflict resolution.
Three things followed from it:
.mdone was the copy from testing: remove the temp profile dir on close; pythonEnv tests clean up #2'smerge base (
1b369c0), which predates the 0.2.2 release — so it had lost theentire 0.2.2 section: the rectangle widget, the text labels, the readout,
the anyplotlib 0.10.0 floor.
CHANGELOG.rststill has all of it, so nothingis gone for good, but the two files disagreed about what shipped.
release notes would not have mentioned it at all. Before this PR,
towncrier build --draftlisted only ci: a Prepare Release workflow, so the tag and__version__agree by construction #7 and the towncrier setup — Michael'sfix was invisible.
.mdstill pointed atv0.2.1...HEAD.The fix
The resolution the rebase wanted:
CHANGELOG.mdstays deleted, and #2'sparagraph becomes
upcoming_changes/2.bugfix.rst.After this,
towncrier build --draft --version 0.2.3gives:Note for #4
#4's branch was rebased the same way — its head carries
CHANGELOG.md | 11 +insteadof a fragment, so merging it as-is puts the same file back. There is a rebased
version ready that carries
upcoming_changes/4.bugfix.rstinstead.