Thanks to visit codestin.com
Credit goes to github.com

Skip to content

TST: splitlines in rec2txt test #6423

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 4 commits into from
May 17, 2016
Merged

TST: splitlines in rec2txt test #6423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
966f50b
TST: splitlines in rec2txt test
tacaswell May 14, 2016
1900372
FIX: compute str column width
tacaswell May 16, 2016
0cb2c3a
CI: disable conda package building
tacaswell May 17, 2016
7765024
FIX: try more reliable way to get string length
tacaswell May 17, 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
3 changes: 2 additions & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ test_script:
- '%CMD_IN_ENV% python setup.py develop'
# tests
- python tests.py
# remove to get around libpng issue?
- python visual_tests.py

after_test:
Expand All @@ -108,7 +109,7 @@ after_test:
- cmd: path
- cmd: where python
- cmd: '%CMD_IN_ENV% conda config --get channels'
- cmd: '%CMD_IN_ENV% conda build .\ci\conda_recipe'
# - cmd: '%CMD_IN_ENV% conda build .\ci\conda_recipe'

# Move the conda package into the dist directory, to register it
# as an "artifact" for Appveyor.
Expand Down
5 changes: 2 additions & 3 deletions lib/matplotlib/mlab.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3188,9 +3188,8 @@ def get_justify(colname, column, precision):
ntype = column.dtype

if np.issubdtype(ntype, str) or np.issubdtype(ntype, bytes):
# The division below handles unicode stored in array, which could
# have 4 bytes per char
length = max(len(colname), column.itemsize // column[0].itemsize)
fixed_width = int(ntype.str[2:])
length = max(len(colname), fixed_width)
return 0, length+padding, "%s" # left justify

if np.issubdtype(ntype, np.int):
Expand Down
8 changes: 4 additions & 4 deletions lib/matplotlib/tests/test_mlab.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,10 +403,10 @@ def test_csv2txt_basic(self):
(str('y'), np.int8),
(str('s'), str, 3),
(str('s2'), str, 4)]))
truth = (' x y s s2\n'
' 1.000 2 foo bing \n'
' 2.000 3 bar blah ')
assert_equal(mlab.rec2txt(a), truth)
truth = (' x y s s2\n'
' 1.000 2 foo bing \n'
' 2.000 3 bar blah ').splitlines()
assert_equal(mlab.rec2txt(a).splitlines(), truth)


class window_testcase(CleanupTestCase):
Expand Down