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 master into live #145

Merged
merged 29 commits into from
Jan 14, 2019
Merged

Merge master into live #145

merged 29 commits into from
Jan 14, 2019

Conversation

andylolz
Copy link
Contributor

It would be great to get the latest changes on master deployed to production.

andylolz and others added 29 commits June 13, 2018 13:52
These ensure a non-humanitarian activity won’t be included in the
“clusters” score or the “appeal or emergency details” score.
`contains_humanitarian_scope` and `uses_humanitarian_clusters_vocab`
should only be true for humanitarian activities – it shouldn’t be
possible for these to equal 1 if the activity isn’t declared as
humanitarian via either the sector code or the humanitarian attribute.
Adding UNHCR to reference_spend_data
Changes folder name to reference IATI v2.03 which was released in February 2018. This change appears to have slipped through the cracks of #118
Update folder name for latest IATI version
Adds tests for cases where a non-truthy humanitarian attribute is present.
Makes docstrings consistent with those initially in the file.
Additional humanitarian fix and test suite improvements
Adding budget-not-provided methods to dashboard.py
@samuele-mattiuzzo
Copy link
Contributor

obviously, thanks Andy.

@coveralls
Copy link

Coverage Status

Coverage increased (+1.1%) to 56.459% when pulling af24d8b on master into 232703f on live.

@samuele-mattiuzzo samuele-mattiuzzo merged commit 789e8d4 into live Jan 14, 2019
@andylolz
Copy link
Contributor Author

👍

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.

None yet

5 participants