Skip to content

Merge stable branch into master#1631

Merged
mliu49 merged 16 commits into
masterfrom
stable
Jun 17, 2019
Merged

Merge stable branch into master#1631
mliu49 merged 16 commits into
masterfrom
stable

Conversation

@mliu49

@mliu49 mliu49 commented Jun 17, 2019

Copy link
Copy Markdown
Contributor

The stable branch was created to allow for more flexibility in creating releases and applying hotfixes while not impacting normal development on master.

As such, the past releases have been tagged on stable. However, this means that these tags are not visible from master.

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 from master.

To fix this, instead of merging the release branch (e.g. v2.X.Y) into both stable and master, we can merge it into stable and then merge stable into master, which will ensure that the newly tagged release is also visible on master.

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.

@codecov

codecov Bot commented Jun 17, 2019

Copy link
Copy Markdown

Codecov Report

Merging #1631 into master will increase coverage by 0.04%.
The diff coverage is n/a.

Impacted file tree graph

@@            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
Impacted Files Coverage Δ
rmgpy/data/kinetics/family.py 52.9% <0%> (+0.23%) ⬆️
rmgpy/scoop_framework/framework.py 32.46% <0%> (+5.19%) ⬆️
rmgpy/scoop_framework/util.py 77.58% <0%> (+8.62%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0f123d8...caebd48. Read the comment docs.

@mliu49
mliu49 merged commit 2adfbb5 into master Jun 17, 2019
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.

1 participant