/matplotlib

Remove some numpy 1.6 workarounds #7494

Merged
merged 11 commits into from Nov 24, 2016
+16 −87

Conversation

Reviewers

@tacaswell tacaswell

@story645 story645

Assignees
No one assigned
Labels
None yet
Projects

Done in Reviewing pull requests.

Milestone
  2.1 (next point r...
5 participants
@dstansby @codecov-io @tacaswell @NelleV @story645
@dstansby
Contributor

dstansby commented Nov 21, 2016

Partially fixes #7484

dstansby added some commits Nov 21, 2016

@dstansby dstansby Remove local definition of putmask 207edcf
@dstansby dstansby Use minlength kwarg 8ce11f2
@dstansby dstansby Simplifiy to_array for numpy >= 1.7 79b9ee0
@dstansby dstansby Replace _putmask calls with copyto calls 3a42131
@dstansby dstansby Remove old to_array method 77dbccc
@dstansby dstansby Simplify convert_to_string for numpy >= 1.7 74d2d33
@dstansby dstansby Use numpy's unicode type in covert_to_string fcef8fd
@dstansby dstansby Fix convert_to_string method

Some checks were not successful

1 errored, 1 failing, and 3 successful checks
continuous-integration/appveyor/pr — AppVeyor build cancelled
Details
coverage/coveralls — Coverage decreased (-4.6%) to 62.001%
Details
codecov/patch — 100% of diff hit (target 66.56%)
Details
codecov/project — Absolute coverage decreased by -4.56% but relative coverage increased by +33.43% compared to 258dbf5
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
aa0e899

tacaswell added this to the 2.1 (next point release) milestone Nov 21, 2016

lib/matplotlib/category.py
@@ -80,22 +61,7 @@ def __init__(self, seq):
def convert_to_string(value):
@story645

story645 Nov 21, 2016

Member

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

dstansby added some commits Nov 21, 2016

@dstansby dstansby Remove convert_to_string method 13c965d
@dstansby dstansby Remove category string conversion test

All checks have failed

1 errored and 1 failing checks
continuous-integration/appveyor/pr — AppVeyor build cancelled
Details
continuous-integration/travis-ci/pr — The Travis CI build failed
Details
2983fbd
@dstansby dstansby Remove old numpy 1.6 comment

Some checks were not successful

2 failing and 1 successful checks
continuous-integration/appveyor/pr — AppVeyor build failed
Details
coverage/coveralls — Coverage decreased (-4.6%) to 62.0%
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
430f789
@codecov-io

codecov-io commented Nov 21, 2016

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 changed the title from Remove some numpy 1.6 workarounds to [MRG] Remove some numpy 1.6 workarounds Nov 21, 2016

tacaswell changed the title from [MRG] Remove some numpy 1.6 workarounds to [MRG+2] Remove some numpy 1.6 workarounds Nov 22, 2016

@tacaswell
Owner

tacaswell commented Nov 22, 2016

We should wait for appveyor on this one.
@NelleV
Contributor

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
1 of 3 checks passed

1 of 3 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details
coverage/coveralls Coverage decreased (-4.6%) to 62.0%
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

QuLogic changed the title from [MRG+2] Remove some numpy 1.6 workarounds to Remove some numpy 1.6 workarounds Nov 24, 2016

dstansby deleted the dstansby:numpy1.6-workarounds branch Nov 24, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment