Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Release 0.5.2 Changelog into master #1114

Merged
merged 4 commits into from
Apr 5, 2021
Merged

Merge Release 0.5.2 Changelog into master #1114

merged 4 commits into from
Apr 5, 2021

Conversation

ericholscher
Copy link
Member

@ericholscher ericholscher commented Apr 5, 2021

This is merging the changes from 0.5.2 back into master, so the changelog is up to date.

Docutils 0.17 changes some rendering of properties, until support is added we should probably pin to use an older version.

I may not be a bad idea to keep a pinned version in the theme to prevent this issue in the future.
@ericholscher
Copy link
Member Author

-> git diff --stat 0.5.1 rel-0.5.2
 docs/changelog.rst | 9 +++++++++
 package-lock.json  | 2 +-
 package.json       | 2 +-
 setup.py           | 1 +
 4 files changed, 12 insertions(+), 2 deletions(-)

@ericholscher ericholscher added the Status: blocked Issue is blocked on another issue label Apr 5, 2021
@ericholscher ericholscher added the PR: hotfix Pull request applied as hotfix to release label Apr 5, 2021
setup.py Show resolved Hide resolved
Include a changelog and bump versions
@ericholscher
Copy link
Member Author

@ericholscher ericholscher changed the title Release 0.5.2 Merge Release 0.5.2 Changelog into master Apr 5, 2021
@ericholscher ericholscher removed the Status: blocked Issue is blocked on another issue label Apr 5, 2021
@ericholscher
Copy link
Member Author

This PR has been updated to now be the changes from 0.5.2 being merged back into master so we don't lose them. 👍

@Blendify Blendify merged commit ca2719b into master Apr 5, 2021
@Blendify Blendify deleted the rel-0.5.2 branch April 5, 2021 17:14
gibsramen added a commit to biocore/BIRDMAn that referenced this pull request Apr 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR: hotfix Pull request applied as hotfix to release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants