Merge stable branch into master #1631
Merged
Conversation
This file contains 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
This fixes a bug where no reactions are generated because the react flags are reset after each reaction system. This also makes the initial react stage more similar to how reactions are generated in the main loop, where reacting is done for each reactor.
…dule Update documentation and setup.py accordingly Also add an Arkane test to conda recipe
Codecov Report
@@ Coverage Diff @@
## master #1631 +/- ##
==========================================
+ Coverage 41.47% 41.52% +0.04%
==========================================
Files 176 176
Lines 29314 29314
Branches 6035 6035
==========================================
+ Hits 12158 12172 +14
+ Misses 16303 16289 -14
Partials 853 853
Continue to review full report at Codecov.
|
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.
The
stablebranch was created to allow for more flexibility in creating releases and applying hotfixes while not impacting normal development onmaster.As such, the past releases have been tagged on
stable. However, this means that these tags are not visible frommaster.An obvious side-effect of this can be seen if you try
git describe --tags, which prints the number of commits since the last tag. For RMG-Py, this currently references 2.1.0, which was the last release made frommaster.To fix this, instead of merging the release branch (e.g. v2.X.Y) into both
stableandmaster, we can merge it intostableand then mergestableintomaster, which will ensure that the newly tagged release is also visible onmaster.This PR merges stable into master, which brings over merge commits from each release and a couple hotfixes, all of which are already on master, and of course the release tags.