File tree Expand file tree Collapse file tree 12 files changed +128
-20
lines changed Expand file tree Collapse file tree 12 files changed +128
-20
lines changed Original file line number Diff line number Diff line change 24
24
shell : " bash -l {0}"
25
25
run : |
26
26
conda activate minimal
27
- python -m pip install -e .
27
+ python -m pip install .
28
28
pytest -svx
Original file line number Diff line number Diff line change 57
57
python -m pip install --upgrade pip
58
58
python -m pip install -U pip setuptools wheel codecov line_profiler
59
59
python -m pip install -rrequirements_dev_minimal.txt numpy${{ matrix.numpy_version}} -rrequirements_dev_optional.txt pymongo redis
60
- python -m pip install -e .
60
+ python -m pip install .
61
61
python -m pip freeze
62
62
- name : Tests
63
63
shell : " bash -l {0}"
Original file line number Diff line number Diff line change 39
39
python -m pip install --upgrade pip
40
40
python -m pip install -U pip setuptools wheel
41
41
python -m pip install -r requirements_dev_numpy.txt -r requirements_dev_minimal.txt -r requirements_dev_optional.txt
42
- python -m pip install -e .
42
+ python -m pip install .
43
43
python -m pip freeze
44
44
npm install -g azurite
45
45
- name : Run Tests
Original file line number Diff line number Diff line change @@ -6,6 +6,17 @@ Release notes
6
6
Unreleased
7
7
----------
8
8
9
+ .. _release_2.10.2 :
10
+
11
+ 2.10.2
12
+ ------
13
+
14
+ Bug fixes
15
+ ~~~~~~~~~
16
+
17
+ * Fix NestedDirectoryStore datasets without dimension_separator metadata.
18
+ By :user: `Josh Moore <joshmoore> `; :issue: `850 `.
19
+
9
20
.. _release_2.10.1 :
10
21
11
22
2.10.1
Original file line number Diff line number Diff line change 10
10
"id": "blosc",
11
11
"shuffle": 1
12
12
},
13
+ "dimension_separator": ".",
13
14
"dtype": "<i8",
14
15
"fill_value": 0,
15
16
"filters": null,
19
20
2
20
21
],
21
22
"zarr_format": 2
22
- }
23
+ }
Original file line number Diff line number Diff line change
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
+ }
Original file line number Diff line number Diff line change
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
+ }
Original file line number Diff line number Diff line change @@ -195,7 +195,18 @@ def _load_metadata_nosync(self):
195
195
self ._dtype = meta ['dtype' ]
196
196
self ._fill_value = meta ['fill_value' ]
197
197
self ._order = meta ['order' ]
198
- self ._dimension_separator = meta .get ('dimension_separator' , '.' )
198
+
199
+ dimension_separator = meta .get ('dimension_separator' , None )
200
+ if dimension_separator is None :
201
+ try :
202
+ dimension_separator = self ._store ._dimension_separator
203
+ except (AttributeError , KeyError ):
204
+ pass
205
+
206
+ # Fallback for any stores which do not choose a default
207
+ if dimension_separator is None :
208
+ dimension_separator = "."
209
+ self ._dimension_separator = dimension_separator
199
210
200
211
# setup compressor
201
212
config = meta ['compressor' ]
You can’t perform that action at this time.
0 commit comments