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

156 hfc 245 #163

Merged
merged 7 commits into from Oct 19, 2018
Merged

156 hfc 245 #163

merged 7 commits into from Oct 19, 2018

Conversation

znicholls
Copy link
Collaborator

@znicholls znicholls commented Oct 19, 2018

Pull request

Please confirm that this pull request has done the following:

  • Tests added
  • Documentation added (where applicable)
  • Example added (either to an existing notebook or as a new notebook, where applicable)
  • Description in CHANGELOG.rst added

Adding to CHANGELOG.rst

Please add a single line in the changelog notes similar to one of the following:

- (`#XX <http://link-to-pr.com>`_) Added feature which does something
- (`#XX <http://link-to-pr.com>`_) Fixed bug identified in (`#XX <http://link-to-issue.com>`_)

closes #156

@rgieseke
Copy link
Member

Seems a useful change and clarification!

@znicholls
Copy link
Collaborator Author

znicholls commented Oct 19, 2018

it's more complicated than I thought, give me an hour

@znicholls znicholls changed the title 156 hfc 245 WIP: 156 hfc 245 Oct 19, 2018
@znicholls znicholls changed the title WIP: 156 hfc 245 156 hfc 245 Oct 19, 2018
@znicholls
Copy link
Collaborator Author

ok @rgieseke all yours (checks pending)

@znicholls znicholls mentioned this pull request Oct 19, 2018
4 tasks
@codecov-io
Copy link

codecov-io commented Oct 19, 2018

Codecov Report

Merging #163 into master will increase coverage by 0.02%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #163      +/-   ##
==========================================
+ Coverage   96.73%   96.76%   +0.02%     
==========================================
  Files           5        5              
  Lines        1132     1142      +10     
  Branches      174      177       +3     
==========================================
+ Hits         1095     1105      +10     
  Misses         20       20              
  Partials       17       17
Impacted Files Coverage Δ
pymagicc/definitions/__init__.py 98.44% <100%> (+0.13%) ⬆️

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 2acaec1...1b91ec4. Read the comment docs.

@rgieseke rgieseke merged commit 89ec4d4 into master Oct 19, 2018
@rgieseke
Copy link
Member

Just a question, the new way is without Hyphen, because we want that later anyway?

@rgieseke rgieseke deleted the 156-hfc-245 branch October 19, 2018 15:25
@znicholls
Copy link
Collaborator Author

znicholls commented Oct 19, 2018 via email

@rgieseke
Copy link
Member

Always trade-offs :-)
In general, I prefer simple usability as Pandas DataFrames columns (no spaces, no hyphens), but it can be useful to stay consistent with other variable names. The current one is fine though!

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.

MAGICC6 to MAGICC7 HFC-245 mapping
3 participants