Skip to content

Commit ba4061f

Browse files
committed
remove nose from remaining test files
1 parent 745c7af commit ba4061f

File tree

7 files changed

+311
-303
lines changed

7 files changed

+311
-303
lines changed

requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
asciitree
2-
nose
32
pytest
43
numpy
54
fasteners

requirements_dev.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ idna==2.6
1515
mccabe==0.6.1
1616
monotonic==1.3
1717
msgpack-python==0.4.8
18-
nose==1.3.7
1918
numcodecs==0.5.2
2019
numpy==1.13.3
2120
packaging==16.8

zarr/tests/test_info.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
from __future__ import absolute_import, print_function, division
33

44

5-
from nose.tools import assert_list_equal
6-
7-
85
import zarr
96
import numcodecs
107

@@ -24,7 +21,7 @@ def test_info():
2421
'Type', 'Read-only', 'Synchronizer type', 'Store type', 'Chunk store type',
2522
'No. members', 'No. arrays', 'No. groups', 'Arrays', 'Groups', 'Name'
2623
])
27-
assert_list_equal(expected_keys, keys)
24+
assert expected_keys == keys
2825

2926
# test array info
3027
items = z.info_items()
@@ -34,4 +31,4 @@ def test_info():
3431
'Compressor', 'Synchronizer type', 'Store type', 'Chunk store type', 'No. bytes',
3532
'No. bytes stored', 'Storage ratio', 'Chunks initialized', 'Name'
3633
])
37-
assert_list_equal(expected_keys, keys)
34+
assert expected_keys == keys

zarr/tests/test_meta.py

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import base64
55

66

7-
from nose.tools import eq_ as eq, assert_is_none, assert_raises
87
import numpy as np
8+
import pytest
99

1010

1111
from zarr.compat import binary_type, text_type, PY2
@@ -15,14 +15,14 @@
1515
from zarr.codecs import Delta, Zlib, Blosc
1616

1717

18-
def assert_json_eq(expect, actual):
18+
def assert_json_equal(expect, actual):
1919
if isinstance(expect, binary_type): # pragma: py3 no cover
2020
expect = text_type(expect, 'ascii')
2121
if isinstance(actual, binary_type):
2222
actual = text_type(actual, 'ascii')
2323
ej = json.loads(expect)
2424
aj = json.loads(actual)
25-
eq(ej, aj)
25+
assert ej == aj
2626

2727

2828
def test_encode_decode_array_1():
@@ -50,18 +50,18 @@ def test_encode_decode_array_1():
5050

5151
# test encoding
5252
meta_enc = encode_array_metadata(meta)
53-
assert_json_eq(meta_json, meta_enc)
53+
assert_json_equal(meta_json, meta_enc)
5454

5555
# test decoding
5656
meta_dec = decode_array_metadata(meta_enc)
57-
eq(ZARR_FORMAT, meta_dec['zarr_format'])
58-
eq(meta['shape'], meta_dec['shape'])
59-
eq(meta['chunks'], meta_dec['chunks'])
60-
eq(meta['dtype'], meta_dec['dtype'])
61-
eq(meta['compressor'], meta_dec['compressor'])
62-
eq(meta['order'], meta_dec['order'])
63-
assert_is_none(meta_dec['fill_value'])
64-
assert_is_none(meta_dec['filters'])
57+
assert ZARR_FORMAT == meta_dec['zarr_format']
58+
assert meta['shape'] == meta_dec['shape']
59+
assert meta['chunks'] == meta_dec['chunks']
60+
assert meta['dtype'] == meta_dec['dtype']
61+
assert meta['compressor'] == meta_dec['compressor']
62+
assert meta['order'] == meta_dec['order']
63+
assert meta_dec['fill_value'] is None
64+
assert meta_dec['filters'] is None
6565

6666

6767
def test_encode_decode_array_2():
@@ -100,19 +100,19 @@ def test_encode_decode_array_2():
100100

101101
# test encoding
102102
meta_enc = encode_array_metadata(meta)
103-
assert_json_eq(meta_json, meta_enc)
103+
assert_json_equal(meta_json, meta_enc)
104104

105105
# test decoding
106106
meta_dec = decode_array_metadata(meta_enc)
107-
eq(ZARR_FORMAT, meta_dec['zarr_format'])
108-
eq(meta['shape'], meta_dec['shape'])
109-
eq(meta['chunks'], meta_dec['chunks'])
110-
eq(meta['dtype'], meta_dec['dtype'])
111-
eq(meta['compressor'], meta_dec['compressor'])
112-
eq(meta['order'], meta_dec['order'])
107+
assert ZARR_FORMAT == meta_dec['zarr_format']
108+
assert meta['shape'] == meta_dec['shape']
109+
assert meta['chunks'] == meta_dec['chunks']
110+
assert meta['dtype'] == meta_dec['dtype']
111+
assert meta['compressor'] == meta_dec['compressor']
112+
assert meta['order'] == meta_dec['order']
113113
np_fill_value = np.array(meta['fill_value'], dtype=meta['dtype'])[()]
114-
eq(np_fill_value, meta_dec['fill_value'])
115-
eq([df.get_config()], meta_dec['filters'])
114+
assert np_fill_value == meta_dec['fill_value']
115+
assert [df.get_config()] == meta_dec['filters']
116116

117117

118118
def test_encode_decode_fill_values_nan():
@@ -148,7 +148,7 @@ def test_encode_decode_fill_values_nan():
148148

149149
# test encoding
150150
meta_enc = encode_array_metadata(meta)
151-
assert_json_eq(meta_json, meta_enc)
151+
assert_json_equal(meta_json, meta_enc)
152152

153153
# test decoding
154154
meta_dec = decode_array_metadata(meta_enc)
@@ -191,13 +191,13 @@ def test_encode_decode_fill_values_bytes():
191191
}''' % (s, ZARR_FORMAT)
192192

193193
# test encoding
194-
assert_json_eq(meta_json, meta_enc)
194+
assert_json_equal(meta_json, meta_enc)
195195

196196
# test decoding
197197
meta_dec = decode_array_metadata(meta_enc)
198198
actual = meta_dec['fill_value']
199199
expect = np.array(v, dtype=dtype)[()]
200-
eq(expect, actual)
200+
assert expect == actual
201201

202202

203203
def test_decode_array_unsupported_format():
@@ -212,7 +212,7 @@ def test_decode_array_unsupported_format():
212212
"fill_value": null,
213213
"order": "C"
214214
}''' % (ZARR_FORMAT - 1)
215-
with assert_raises(MetadataError):
215+
with pytest.raises(MetadataError):
216216
decode_array_metadata(meta_json)
217217

218218

@@ -222,7 +222,7 @@ def test_decode_array_missing_fields():
222222
meta_json = '''{
223223
"zarr_format": %s
224224
}''' % ZARR_FORMAT
225-
with assert_raises(MetadataError):
225+
with pytest.raises(MetadataError):
226226
decode_array_metadata(meta_json)
227227

228228

@@ -233,7 +233,7 @@ def test_encode_decode_dtype():
233233
s = json.dumps(e) # check JSON serializable
234234
o = json.loads(s)
235235
d = decode_dtype(o)
236-
eq(np.dtype(dt), d)
236+
assert np.dtype(dt) == d
237237

238238

239239
def test_decode_group():
@@ -243,11 +243,11 @@ def test_decode_group():
243243
"zarr_format": %s
244244
}''' % ZARR_FORMAT
245245
meta = decode_group_metadata(b)
246-
eq(ZARR_FORMAT, meta['zarr_format'])
246+
assert ZARR_FORMAT == meta['zarr_format']
247247

248248
# unsupported format
249249
b = '''{
250250
"zarr_format": %s
251251
}''' % (ZARR_FORMAT - 1)
252-
with assert_raises(MetadataError):
252+
with pytest.raises(MetadataError):
253253
decode_group_metadata(b)

0 commit comments

Comments
 (0)