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.

Sign up for GitHub

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
Merged

Remove some numpy 1.6 workarounds #7494

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
207edcf
Remove local definition of putmask
dstansby Nov 21, 2016
8ce11f2
Use minlength kwarg
dstansby Nov 21, 2016
79b9ee0
Simplifiy to_array for numpy >= 1.7
dstansby Nov 21, 2016
3a42131
Replace _putmask calls with copyto calls
dstansby Nov 21, 2016
77dbccc
Remove old to_array method
dstansby Nov 21, 2016
74d2d33
Simplify convert_to_string for numpy >= 1.7
dstansby Nov 21, 2016
fcef8fd
Use numpy's unicode type in covert_to_string
dstansby Nov 21, 2016
aa0e899
Fix convert_to_string method
dstansby Nov 21, 2016
13c965d
Remove convert_to_string method
dstansby Nov 21, 2016
2983fbd
Remove category string conversion test
dstansby Nov 21, 2016
430f789
Remove old numpy 1.6 comment
dstansby Nov 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Simplifiy to_array for numpy >= 1.7
  • Loading branch information
@dstansby
dstansby committed Nov 21, 2016
commit 79b9ee07924592cd9bc7854937b5be02bcdb4fe6
17 changes: 1 addition & 16 deletions lib/matplotlib/category.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,8 @@
import matplotlib.ticker as ticker


# pure hack for numpy 1.6 support
from distutils.version import LooseVersion

NP_NEW = (LooseVersion(np.version.version) >= LooseVersion('1.7'))


def to_array(data, maxlen=100):
if NP_NEW:
return np.array(data, dtype=np.unicode)
if cbook.is_scalar_or_string(data):
data = [data]
try:
vals = np.array(data, dtype=('|S', maxlen))
except UnicodeEncodeError:
# this yields gibberish
vals = np.array([convert_to_string(d) for d in data])
return vals
return np.array(data, dtype=np.unicode)


class StrCategoryConverter(units.ConversionInterface):
Expand Down