Skip to content

Commit a8dbbc1

Browse files
authored
Merge pull request #237 from jakirkham/req_numcodecs_0.5.3
Require numcodecs 0.5.3 and drop nose
2 parents c5319d6 + 046b2c7 commit a8dbbc1

File tree

6 files changed

+14
-17
lines changed

6 files changed

+14
-17
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ htmlcov/
3939
.coverage
4040
.coverage.*
4141
.cache
42-
nosetests.xml
4342
coverage.xml
4443
*,cover
4544

docs/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ To work with Zarr source code in development, install from GitHub::
5454

5555
To verify that Zarr has been fully installed, run the test suite::
5656

57-
$ pip install nose
58-
$ python -m nose -v zarr
57+
$ pip install pytest
58+
$ python -m pytest -v --pyargs zarr
5959

6060
Contents
6161
--------

docs/tutorial.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@ print some diagnostics, e.g.::
178178
: blocksize=0)
179179
Store type : builtins.dict
180180
No. bytes : 400000000 (381.5M)
181-
No. bytes stored : 3702484 (3.5M)
182-
Storage ratio : 108.0
181+
No. bytes stored : 3242241 (3.1M)
182+
Storage ratio : 123.4
183183
Chunks initialized : 100/100
184184

185185
If you don't specify a compressor, by default Zarr uses the Blosc
@@ -270,8 +270,8 @@ Here is an example using a delta filter with the Blosc compressor::
270270
Compressor : Blosc(cname='zstd', clevel=1, shuffle=SHUFFLE, blocksize=0)
271271
Store type : builtins.dict
272272
No. bytes : 400000000 (381.5M)
273-
No. bytes stored : 328085 (320.4K)
274-
Storage ratio : 1219.2
273+
No. bytes stored : 648605 (633.4K)
274+
Storage ratio : 616.7
275275
Chunks initialized : 100/100
276276

277277
For more information about available filter codecs, see the `Numcodecs
@@ -394,8 +394,8 @@ property. E.g.::
394394
Compressor : Blosc(cname='lz4', clevel=5, shuffle=SHUFFLE, blocksize=0)
395395
Store type : zarr.storage.DictStore
396396
No. bytes : 8000000 (7.6M)
397-
No. bytes stored : 34840 (34.0K)
398-
Storage ratio : 229.6
397+
No. bytes stored : 33460 (32.7K)
398+
Storage ratio : 239.1
399399
Chunks initialized : 10/10
400400

401401
>>> baz.info
@@ -1143,8 +1143,8 @@ ratios, depending on the correlation structure within the data. E.g.::
11431143
Compressor : Blosc(cname='lz4', clevel=5, shuffle=SHUFFLE, blocksize=0)
11441144
Store type : builtins.dict
11451145
No. bytes : 400000000 (381.5M)
1146-
No. bytes stored : 15857834 (15.1M)
1147-
Storage ratio : 25.2
1146+
No. bytes stored : 10502688 (10.0M)
1147+
Storage ratio : 38.1
11481148
Chunks initialized : 100/100
11491149
>>> f = zarr.array(a, chunks=(1000, 1000), order='F')
11501150
>>> f.info
@@ -1157,8 +1157,8 @@ ratios, depending on the correlation structure within the data. E.g.::
11571157
Compressor : Blosc(cname='lz4', clevel=5, shuffle=SHUFFLE, blocksize=0)
11581158
Store type : builtins.dict
11591159
No. bytes : 400000000 (381.5M)
1160-
No. bytes stored : 7233241 (6.9M)
1161-
Storage ratio : 55.3
1160+
No. bytes stored : 5530511 (5.3M)
1161+
Storage ratio : 72.3
11621162
Chunks initialized : 100/100
11631163

11641164
In the above example, Fortran order gives a better compression ratio. This is an

requirements_dev.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ idna==2.6
1515
mccabe==0.6.1
1616
monotonic==1.3
1717
msgpack-python==0.4.8
18-
nose==1.3.7
19-
numcodecs==0.5.2
18+
numcodecs==0.5.3
2019
numpy==1.13.3
2120
packaging==16.8
2221
pkginfo==1.4.1

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
'asciitree',
2727
'numpy>=1.7',
2828
'fasteners',
29-
'numcodecs>=0.5.2',
29+
'numcodecs>=0.5.3',
3030
],
3131
package_dir={'': '.'},
3232
packages=['zarr', 'zarr.tests'],

windows_conda_dev.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ fasteners
44
flake8
55
monotonic
66
msgpack-python
7-
nose
87
numcodecs
98
numpy
109
setuptools_scm

0 commit comments

Comments
 (0)