Skip to content

Remove some numpy 1.6 workarounds #7494

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

Merged
merged 11 commits into from
Nov 24, 2016

Conversation

dstansby
Copy link
Member

Partially fixes #7484

@tacaswell tacaswell added this to the 2.1 (next point release) milestone Nov 21, 2016
@@ -80,22 +61,7 @@ def __init__(self, seq):


def convert_to_string(value):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@codecov-io
Copy link

Current coverage is 62.00% (diff: 100%)

Merging #7494 into master will decrease coverage by 4.56%

@@             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           

Powered by Codecov. Last update 258dbf5...aa0e899

@NelleV NelleV changed the title Remove some numpy 1.6 workarounds [MRG] Remove some numpy 1.6 workarounds Nov 21, 2016
@tacaswell tacaswell changed the title [MRG] Remove some numpy 1.6 workarounds [MRG+2] Remove some numpy 1.6 workarounds Nov 22, 2016
@tacaswell
Copy link
Member

We should wait for appveyor on this one.

@NelleV
Copy link
Member

NelleV commented Nov 23, 2016

Appveyor finally got there… The failure seems unrelated. @tacaswell should we merge this?

@tacaswell tacaswell merged commit 9bcbfc4 into matplotlib:master Nov 24, 2016
@QuLogic QuLogic changed the title [MRG+2] Remove some numpy 1.6 workarounds Remove some numpy 1.6 workarounds Nov 24, 2016
@dstansby dstansby deleted the numpy1.6-workarounds branch November 24, 2016 11:07
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.

Remove numpy 1.6 specific work-arounds
5 participants