Skip to content

Commit 2e85d55

Browse files
joshmoorejoshmoore
authored
Merge branch 'master' into fix-fsstore-listdir-nested
2 parents 6d2f032 + 1a2eeed commit 2e85d55

28 files changed

+686
-297
lines changed

‎.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
zarr/_storage/absstore.py @zarr-developers/azure-team

‎docs/contributing.rst

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -350,15 +350,7 @@ Tag the version (where "X.X.X" stands for the version number, e.g., "2.2.0")::
350350

351351
$ version=X.X.X
352352
$ git tag -a v$version -m v$version
353-
$ git push --tags
353+
$ git push origin v$version
354354

355-
Release source code to PyPI::
356-
357-
$ twine upload dist/zarr-${version}.tar.gz
358-
359-
Obtain checksum for release to conda-forge::
360-
361-
$ openssl sha256 dist/zarr-${version}.tar.gz
362-
363-
Release to conda-forge by making a pull request against the zarr-feedstock conda-forge
364-
repository, incrementing the version number.
355+
Create a GitHub release in order to generate the Zenodo DOI and
356+
review the automatically generated zarr-feedstock PR.

‎docs/release.rst

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,107 @@
11
Release notes
22
=============
33

4+
.. _unreleased:
5+
46
Unreleased
57
----------
68

9+
.. _release_2.9.4:
10+
11+
2.9.4
12+
-----
13+
14+
Bug fixes
15+
~~~~~~~~~
16+
17+
* Fix structured arrays that contain objects
18+
By :user: `Attila Bergou <abergou>`; :issue: `806`
19+
20+
.. _release_2.9.3:
21+
22+
2.9.3
23+
-----
24+
25+
Maintenance
26+
~~~~~~~~~~~
27+
28+
* Mark the fact that some tests that require ``fsspec``, without compromising the code coverage score.
29+
By :user:`Ben Williams <benjaminhwilliams>`; :issue:`823`.
30+
31+
* Only inspect alternate node type if desired isn't present.
32+
By :user:`Trevor Manz <manzt>`; :issue:`696`.
33+
34+
.. _release_2.9.2:
35+
36+
2.9.2
37+
-----
38+
39+
Maintenance
40+
~~~~~~~~~~~
41+
42+
* Correct conda-forge deployment of Zarr by fixing some Zarr tests.
43+
By :user:`Ben Williams <benjaminhwilliams>`; :issue:`821`.
44+
45+
.. _release_2.9.1:
46+
47+
2.9.1
48+
-----
49+
50+
Maintenance
51+
~~~~~~~~~~~
52+
53+
* Correct conda-forge deployment of Zarr.
54+
By :user:`Josh Moore <joshmoore>`; :issue:`XXX`.
55+
56+
.. _release_2.9.0:
57+
58+
2.9.0
59+
-----
60+
761
This release of Zarr Python is the first release of Zarr to not support Python 3.6.
862

63+
Enhancements
64+
~~~~~~~~~~~~
65+
66+
* Update ABSStore for compatibility with newer `azure.storage.blob`.
67+
By :user:`Tom Augspurger <TomAugspurger>`; :issue:`759`.
68+
69+
* Pathlib support.
70+
By :user:`Chris Barnes <clbarnes>`; :issue:`768`.
71+
72+
Documentation
73+
~~~~~~~~~~~~~
74+
75+
* Clarify that arbitrary key/value pairs are OK for attributes.
76+
By :user:`Stephan Hoyer <shoyer>`; :issue:`751`.
77+
78+
* Clarify how to manually convert a DirectoryStore to a ZipStore.
79+
By :user:`pmav99 <pmav99>`; :issue:`763`.
80+
81+
Bug fixes
82+
~~~~~~~~~
83+
84+
* Fix dimension_separator support.
85+
By :user:`Josh Moore <joshmoore>`; :issue:`775`.
86+
87+
* Extract ABSStore to zarr._storage.absstore.
88+
By :user:`Josh Moore <joshmoore>`; :issue:`781`.
89+
90+
* avoid NumPy 1.21.0 due to https://github.com/numpy/numpy/issues/19325
91+
By :user:`Greggory Lee <grlee77>`; :issue:`791`.
92+
93+
Maintenance
94+
~~~~~~~~~~~
95+
96+
* Drop 3.6 builds.
97+
By :user:`Josh Moore <joshmoore>`; :issue:`774`, :issue:`778`.
98+
99+
* Fix build with Sphinx 4.
100+
By :user:`Elliott Sales de Andrade <QuLogic>`; :issue:`799`.
101+
102+
* TST: add missing assert in test_hexdigest.
103+
By :user:`Greggory Lee <grlee77>`; :issue:`801`.
104+
9105
.. _release_2.8.3:
10106

11107
2.8.3

‎fixture/flat/.zarray

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"chunks": [
3+
2,
4+
2
5+
],
6+
"compressor": {
7+
"blocksize": 0,
8+
"clevel": 5,
9+
"cname": "lz4",
10+
"id": "blosc",
11+
"shuffle": 1
12+
},
13+
"dtype": "<i8",
14+
"fill_value": 0,
15+
"filters": null,
16+
"order": "C",
17+
"shape": [
18+
2,
19+
2
20+
],
21+
"zarr_format": 2
22+
}

‎fixture/flat/0.0

48 Bytes
Binary file not shown.

‎fixture/nested/.zarray

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"chunks": [
3+
2,
4+
2
5+
],
6+
"compressor": {
7+
"blocksize": 0,
8+
"clevel": 5,
9+
"cname": "lz4",
10+
"id": "blosc",
11+
"shuffle": 1
12+
},
13+
"dimension_separator": "/",
14+
"dtype": "<i8",
15+
"fill_value": 0,
16+
"filters": null,
17+
"order": "C",
18+
"shape": [
19+
2,
20+
2
21+
],
22+
"zarr_format": 2
23+
}

‎fixture/nested/0/0

48 Bytes
Binary file not shown.

‎requirements_dev_minimal.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# library requirements
22
asciitree==0.3.3
33
fasteners==0.16.3
4-
numcodecs==0.8.0
4+
numcodecs==0.8.1
55
msgpack-python==0.5.6
66
setuptools-scm==6.0.1
77
# test requirements

‎requirements_dev_numpy.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Break this out into a separate file to allow testing against
22
# different versions of numpy. This file should pin to the latest
33
# numpy version.
4-
numpy==1.20.3
4+
numpy==1.21.2

‎requirements_dev_optional.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ ipytree==0.2.1
99
azure-storage-blob==12.8.1 # pyup: ignore
1010
redis==3.5.3
1111
types-redis
12-
pymongo==3.11.4
12+
types-setuptools
13+
pymongo==3.12.0
1314
# optional test requirements
14-
tox==3.24.1
15+
tox==3.24.3
1516
coverage
1617
flake8==3.9.2
1718
pytest-cov==2.12.1
18-
pytest-doctestplus==0.10.0
19-
h5py==3.2.1
20-
fsspec[s3]==2021.08.1
21-
moto[server]>=1.3.14
19+
pytest-doctestplus==0.10.1
20+
h5py==3.4.0
21+
fsspec[s3]==2021.08.1

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
python_requires='>=3.7, <4',
3737
install_requires=dependencies,
3838
package_dir={'': '.'},
39-
packages=['zarr', 'zarr.tests'],
39+
packages=['zarr', 'zarr._storage', 'zarr.tests'],
4040
classifiers=[
4141
'Development Status :: 6 - Mature',
4242
'Intended Audience :: Developers',

‎zarr/_storage/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)