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.

Sign up for GitHub

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

Jump to bottom

Rc 26.2 #68

Merged
merged 10 commits into from Jan 13, 2021
Merged

Rc 26.2 #68

merged 10 commits into from Jan 13, 2021

Conversation

aburrell
Copy link
Owner

Description

Brings develop branch up to date with new release.

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • This change requires a documentation update

How Has This Been Tested?

CI and local unit tests.

Checklist:

  • Make sure you are merging into the develop (not main) branch
  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules
  • Add a note to Changelog.rst, summarising the changes
  • Add yourself to AUTHORS.rst

aburrell and others added 10 commits January 6, 2021 13:24
@aburrell
STY: changed master to main
6bfdace 
Changed master to main in README and links.
@aburrell
MAINT: replaced master with main
da8b541 
Found one more instance of master to replace.
@aburrell
REL: bumped version number
aa861f9 
Bumped the version number for the release.
@aburrell
DOC: added target date to changelog
c554756 
Added the target date to the CHANGELOG summary and clarified current python versions used in this release.
@aburrell
BUG: updated zenodo
60ed5c9 
Updated zenodo by removing unnecessary keywords that could impede the use of this file.
@aburrell
MAINT: updated badges for new main branch
7ddd863 
Updated the badge information to use those for the new main branch.
@aburrell
BUG: removed trailing closing bracket
9b4c199 
Removed a trailing closing bracket, as suggested by codacy.
@aburrell
BUG: bad whitespace
5201e1d 
Removed newline that messed up appveyor badge.
@aburrell
BUG: removed trailing comma in json
9beb8e5 
Removed a trailing comma in the json file.
@aburrell
Merge branch 'main' into rc_26.2
9eda1e0
@aburrell aburrell added this to the Version 2.6.2 milestone Jan 13, 2021
@coveralls
Copy link

coveralls commented Jan 13, 2021 •
edited

Pull Request Test Coverage Report for Build 546

  • 1 of 1 (100.0%) changed or added relevant line in 1 file are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 96.855%
Totals Coverage Status
Change from base Build 532: 0.0%
Covered Lines: 1138
Relevant Lines: 1163
💛 - Coveralls

@coveralls
Copy link

Pull Request Test Coverage Report for Build 546

  • 1 of 1 (100.0%) changed or added relevant line in 1 file are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage decreased (-0.002%) to 96.853%
Totals Coverage Status
Change from base Build 532: -0.002%
Covered Lines: 1138
Relevant Lines: 1163
💛 - Coveralls

@aburrell aburrell merged commit 4dcbea9 into develop Jan 13, 2021
@aburrell aburrell deleted the rc_26.2 branch January 13, 2021 20:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Version 2.6.2
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@aburrell @coveralls