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

Prepare zrisher PR #1179 for merging into master branch #1285

Merged
merged 13 commits into from
Apr 12, 2017
Merged

Prepare zrisher PR #1179 for merging into master branch #1285

merged 13 commits into from
Apr 12, 2017

Conversation

martinholmer
Copy link
Collaborator

This pull request resolves a few conflicts with the master branch that have arisen over the course of the two months since #1179 was submitted by @zrisher. Many thanks, @zrisher, for the very useful idea and all your implementation work. See the conversation at #1179 for more details on the rationale for these changes.

@MattHJensen @feenberg @Amy-Xu @andersonfrailey @GoFroggyRun @codykallen

@codecov-io
Copy link

Codecov Report

Merging #1285 into master will decrease coverage by 0.03%.
The diff coverage is 94.11%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1285      +/-   ##
==========================================
- Coverage   99.68%   99.65%   -0.04%     
==========================================
  Files          38       38              
  Lines        2857     2867      +10     
==========================================
+ Hits         2848     2857       +9     
- Misses          9       10       +1
Impacted Files Coverage Δ
taxcalc/records.py 98.73% <94.11%> (-0.39%) ⬇️

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 0807386...37dc3f7. Read the comment docs.

@martinholmer
Copy link
Collaborator Author

Note that the issues raised by @zrisher in #1179 on Feb 20th will be resolved after #1285 is merged.

@martinholmer
Copy link
Collaborator Author

martinholmer commented Apr 11, 2017

Note that the codecov problem with #1185 is inescapable given that we have not figured out how to test the reading of .csv and .json data from a Python egg. The basic idea of #1179 is to put Records class variable metadata into a separate JSON file. And this file will be read from the egg when the Records class is used in a conda package. As a result, this pull request increases the number of untested statements from 9 to 10.

@MattHJensen
Copy link
Contributor

MattHJensen commented Apr 12, 2017

+1 here. Thanks @martinholmer and @zrisher. Merging now so that we can have these changes in 0.8.1, which I am releasing today.

@MattHJensen
Copy link
Contributor

@zrisher, by merging now I don't mean that you shouldn't feel free to look over @martinholmer's additions and suggest any follow ons in a separate PR.

@MattHJensen MattHJensen merged commit 9f9df7a into PSLmodels:master Apr 12, 2017
This was referenced Apr 12, 2017
@martinholmer martinholmer deleted the pr-1179 branch April 14, 2017 20:59
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.

5 participants