Make github workflow which would ensure that PR against master would have everything from maint merged #7590
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.
I think we should retain the habit of releasing minor (or eventually next major) versions from
master
while patch fixes frommaint
(we might even keep releasing patch fixes for the prior minor I guess... but probably we shouldn't).This way we can 'stage' for next minor release while releasing patch releases without bottleneck/force to release miors.
With this PR I want to make sure that when we do release next minor, we do include all fixes from
maint
.As only pertinent to master branch -- I positioned it against master. Also would make it easier to check
PR checklist
CHANGELOG-missing
label to this pull request in order to have a snippet generated from its title;or use
scriv create
locally and include the generated file in the pull request, see scriv).master
ormaint
so it stays "up to date" even if no changes to PR happen -- decided to postpone for later... would need more work.edit: I canceled appveyor since unrelated