Skip to content

Commit f9d09a9

Browse files
author
Martin Durant
committed
Merge branch 'master' into fs_multiget
2 parents 3b0e5f7 + e3cdd1a commit f9d09a9

38 files changed

+342
-219
lines changed

.travis.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
language: python
22

3-
branches:
4-
only:
5-
- master
6-
73
sudo: false
84

95
addons:
@@ -33,6 +29,7 @@ matrix:
3329
- python: 3.8
3430
dist: xenial
3531
sudo: true
32+
env: MYPY_CHECK='true'
3633

3734
before_install:
3835
- docker pull arafato/azurite
@@ -42,11 +39,12 @@ before_script:
4239
- mongo mydb_test --eval 'db.createUser({user:"travis",pwd:"test",roles:["readWrite"]});'
4340

4441
install:
45-
- pip install -U pip setuptools wheel tox-travis coveralls
42+
- pip install -U pip setuptools wheel tox-travis coveralls mypy
4643

4744
script:
4845
- tox
4946
- if [[ $BUILD_DOCS == 'true' ]]; then tox -e docs; fi
47+
- if [[ $MYPY_CHECK == 'true' ]]; then mypy zarr; fi
5048

5149
after_success:
5250
- coveralls --service=travis-pro

docs/conf.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/usr/bin/env python3
2-
# -*- coding: utf-8 -*-
32
#
43
# zarr documentation build configuration file, created by
54
# sphinx-quickstart on Mon May 2 21:40:09 2016.

docs/release.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,28 @@ Release notes
55
Next release
66
------------
77

8+
* `DirectoryStore` now uses `os.scandir`, which should make listing large store
9+
faster, :issue:`563`
10+
11+
* Remove a few remaining Python 2-isms.
12+
By :user:`Poruri Sai Rahul <rahulporuri>`; :issue:`393`.
13+
814
* Fix minor bug in `N5Store`.
915
By :user:`gsakkis`, :issue:`550`.
1016

1117
* Improve error message in Jupyter when trying to use the ``ipytree`` widget
1218
without ``ipytree`` installed.
1319
By :user:`Zain Patel <mzjp2>`; :issue:`537`
1420

21+
* Add typing informations to many of the core functions :issue:`589`
22+
1523
* Explicitly close stores during testing.
1624
By :user:`Elliott Sales de Andrade <QuLogic>`; :issue:`442`
1725

26+
* Many of the convenience functions to emit errors (``err_*`` from
27+
``zarr.errors`` have been replaced by ``ValueError`` subclasses. The
28+
functions are deprecated and will be removed in the future. :issue:`590` )
29+
1830
* Improve consistency of terminology regarding arrays and datasets in the
1931
documentation.
2032
By :user:`Josh Moore <joshmoore>`; :issue:`571`.

mypy.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[mypy]
2+
python_version = 3.6
3+
ignore_missing_imports = True
4+
follow_imports = silent

pytest.ini

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
[pytest]
22
doctest_optionflags = NORMALIZE_WHITESPACE ELLIPSIS IGNORE_EXCEPTION_DETAIL
33
addopts = --durations=10
4-
4+
filterwarnings =
5+
error::DeprecationWarning:zarr.*
6+
ignore:PY_SSIZE_T_CLEAN will be required.*:DeprecationWarning

requirements_dev_minimal.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,3 @@ msgpack-python==0.5.6
66
setuptools-scm==3.3.3
77
# test requirements
88
pytest==5.2.0; python_version > '3.0'
9-
# don't let pyup change this, needed until we drop support for py27
10-
pytest==4.6.5; python_version < '3.0' # pyup: ignore

requirements_dev_numpy.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,3 @@
22
# different versions of numpy. This file should pin to the latest
33
# numpy version.
44
numpy==1.17.2; python_version > '3.0'
5-
# don't let pyup change this, needed until we drop support for py27
6-
numpy==1.16.4; python_version < '3.0' # pyup: ignore

requirements_dev_optional.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pymongo==3.9.0
1313
tox==3.14.0
1414
coverage==5.0.3
1515
coveralls==1.11.1
16-
flake8==3.7.8
16+
flake8==3.8.3
1717
pytest-cov==2.7.1
1818
pytest-doctestplus==0.4.0
1919
pytest-remotedata==0.3.2

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
import sys
32

43
from setuptools import setup

zarr/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
# flake8: noqa
32
from zarr.codecs import *
43
from zarr.convenience import (consolidate_metadata, copy, copy_all, copy_store,

0 commit comments

Comments
 (0)