Remove some numpy 1.6 workarounds#7494
Merged
tacaswell merged 11 commits intomatplotlib:masterfrom Nov 24, 2016
Merged
Conversation
story645
requested changes
Nov 21, 2016
lib/matplotlib/category.py
Outdated
| @@ -80,22 +61,7 @@ def __init__(self, seq): | |||
|
|
|||
|
|
|||
| def convert_to_string(value): | |||
Member
There was a problem hiding this comment.
you should be able to get rid of this function entirely as all the data gets cast to strings with the np.array(dtype=unicode) call and therefore you can remove the call to convert_to_string. Also, you should then remove the test functions from category.py
Current coverage is 62.00% (diff: 100%)@@ master #7494 diff @@
==========================================
Files 109 173 +64
Lines 46636 55999 +9363
Methods 0 0
Messages 0 0
Branches 0 0
==========================================
+ Hits 31043 34720 +3677
- Misses 15593 21279 +5686
Partials 0 0
|
story645
approved these changes
Nov 21, 2016
NelleV
changed the title
tacaswell
changed the title
tacaswell
approved these changes
Nov 22, 2016
Member
|
We should wait for appveyor on this one. |
Member
|
Appveyor finally got there… The failure seems unrelated. @tacaswell should we merge this? |
QuLogic
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Partially fixes #7484