Skip to content

Commit 961619c

Browse files
committed
get_slice_dataset --> open_slice_source
1 parent 2bd36e1 commit 961619c

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

tests/test_slice.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from zappend.context import Context
1111
from zappend.fsutil.fileobj import FileObj
1212
from zappend.slice.abc import SliceSource
13-
from zappend.slice.factory import get_slice_dataset
13+
from zappend.slice.factory import open_slice_source
1414
from zappend.slice.factory import import_attribute
1515
from zappend.slice.factory import to_slice_factories
1616
from zappend.slice.factory import normalize_slice_arg
@@ -22,7 +22,7 @@
2222
from .test_context import CustomSliceSource
2323

2424

25-
class GetSliceDatasetTest(unittest.TestCase):
25+
class OpenSliceSourceTest(unittest.TestCase):
2626
def setUp(self):
2727
clear_memory_fs()
2828

@@ -33,7 +33,7 @@ def test_slice_source_class_slice_source(self):
3333
slice_source="tests.test_context.CustomSliceSource",
3434
)
3535
)
36-
slice_source = get_slice_dataset(ctx, 7)
36+
slice_source = open_slice_source(ctx, 7)
3737
self.assertIsInstance(slice_source, CustomSliceSource)
3838
self.assertEqual(7, slice_source.index)
3939

@@ -44,7 +44,7 @@ def test_slice_source_func_slice_source(self):
4444
slice_source="tests.test_context.new_custom_slice_source",
4545
)
4646
)
47-
slice_source = get_slice_dataset(ctx, 13)
47+
slice_source = open_slice_source(ctx, 13)
4848
self.assertIsInstance(slice_source, CustomSliceSource)
4949
self.assertEqual(13, slice_source.index)
5050

@@ -63,13 +63,13 @@ def test_slice_source_class_slice_source_fails(self):
6363
" 'false_slice_source_function', but got <class 'int'>"
6464
),
6565
):
66-
get_slice_dataset(ctx, "test.nc")
66+
open_slice_source(ctx, "test.nc")
6767

6868
def test_slice_source_slice_source(self):
6969
dataset = make_test_dataset()
7070
ctx = Context(dict(target_dir="memory://target.zarr"))
7171
slice_obj = MemorySliceSource(ctx, dataset, 0)
72-
slice_source = get_slice_dataset(ctx, slice_obj)
72+
slice_source = open_slice_source(ctx, slice_obj)
7373
self.assertIs(slice_obj, slice_source)
7474

7575
def test_slice_factory_slice_source(self):
@@ -80,23 +80,23 @@ def factory(_ctx):
8080
self.assertIs(ctx, _ctx)
8181
return dataset
8282

83-
slice_source = get_slice_dataset(ctx, factory)
83+
slice_source = open_slice_source(ctx, factory)
8484
self.assertIsInstance(slice_source, MemorySliceSource)
8585
with slice_source as slice_ds:
8686
self.assertIs(dataset, slice_ds)
8787

8888
def test_memory_slice_source(self):
8989
dataset = make_test_dataset()
9090
ctx = Context(dict(target_dir="memory://target.zarr"))
91-
slice_source = get_slice_dataset(ctx, dataset)
91+
slice_source = open_slice_source(ctx, dataset)
9292
self.assertIsInstance(slice_source, MemorySliceSource)
9393
with slice_source as slice_ds:
9494
self.assertIsInstance(slice_ds, xr.Dataset)
9595

9696
def test_temporary_slice_source(self):
9797
dataset = make_test_dataset()
9898
ctx = Context(dict(target_dir="memory://target.zarr", persist_mem_slices=True))
99-
slice_source = get_slice_dataset(ctx, dataset)
99+
slice_source = open_slice_source(ctx, dataset)
100100
self.assertIsInstance(slice_source, TemporarySliceSource)
101101
with slice_source as slice_ds:
102102
self.assertIsInstance(slice_ds, xr.Dataset)
@@ -105,7 +105,7 @@ def test_file_obj_slice_source(self):
105105
slice_dir = FileObj("memory://slice.zarr")
106106
make_test_dataset(uri=slice_dir.uri)
107107
ctx = Context(dict(target_dir="memory://target.zarr"))
108-
slice_source = get_slice_dataset(ctx, slice_dir)
108+
slice_source = open_slice_source(ctx, slice_dir)
109109
self.assertIsInstance(slice_source, PersistentSliceSource)
110110
with slice_source as slice_ds:
111111
self.assertIsInstance(slice_ds, xr.Dataset)
@@ -114,7 +114,7 @@ def test_persistent_slice_source_for_zarr(self):
114114
slice_dir = FileObj("memory://slice.zarr")
115115
make_test_dataset(uri=slice_dir.uri)
116116
ctx = Context(dict(target_dir="memory://target.zarr"))
117-
slice_source = get_slice_dataset(ctx, slice_dir.uri)
117+
slice_source = open_slice_source(ctx, slice_dir.uri)
118118
self.assertIsInstance(slice_source, PersistentSliceSource)
119119
with slice_source as slice_ds:
120120
self.assertIsInstance(slice_ds, xr.Dataset)
@@ -140,7 +140,7 @@ def test_persistent_wait_success(self):
140140
slice_polling=dict(timeout=0.1, interval=0.02),
141141
)
142142
)
143-
slice_source = get_slice_dataset(ctx, slice_dir.uri)
143+
slice_source = open_slice_source(ctx, slice_dir.uri)
144144
self.assertIsInstance(slice_source, PersistentSliceSource)
145145
with slice_source as slice_ds:
146146
self.assertIsInstance(slice_ds, xr.Dataset)
@@ -154,7 +154,7 @@ def test_it_raises_on_persistent_wait_fail(self):
154154
slice_polling=dict(timeout=0.1, interval=0.02),
155155
)
156156
)
157-
slice_source = get_slice_dataset(ctx, slice_dir.uri)
157+
slice_source = open_slice_source(ctx, slice_dir.uri)
158158
with pytest.raises(FileNotFoundError, match=slice_dir.uri):
159159
with slice_source:
160160
pass
@@ -164,7 +164,7 @@ def test_it_raises_on_invalid_type(self):
164164
ctx = Context(dict(target_dir="memory://target.zarr"))
165165
with pytest.raises(TypeError, match="slice_obj must be a str, "):
166166
# noinspection PyTypeChecker
167-
get_slice_dataset(ctx, 42)
167+
open_slice_source(ctx, 42)
168168

169169

170170
class YieldSlicesTest(unittest.TestCase):

zappend/processor.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from .log import configure_logging
1717
from .rollbackstore import RollbackStore
1818
from .slice import SliceObj
19-
from .slice import get_slice_dataset
19+
from .slice import open_slice_source
2020
from .tailoring import tailor_target_dataset
2121
from .tailoring import tailor_slice_dataset
2222

@@ -83,7 +83,7 @@ def process_slice(self, slice_obj: SliceObj, slice_index: int = 0):
8383

8484
ctx = Context(self._config)
8585

86-
with get_slice_dataset(ctx, slice_obj, slice_index) as slice_dataset:
86+
with open_slice_source(ctx, slice_obj, slice_index) as slice_dataset:
8787
slice_metadata = ctx.get_dataset_metadata(slice_dataset)
8888
if ctx.target_metadata is None:
8989
ctx.target_metadata = slice_metadata

zappend/slice/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from .abc import SliceSource
66
from .factory import SliceFactory
77
from .factory import SliceObj
8-
from .factory import get_slice_dataset
8+
from .factory import open_slice_source
99
from .factory import to_slice_factories
1010
from .factory import to_slice_factory
1111
from .factory import to_slice_source_type

zappend/slice/factory.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
"""
2525

2626

27-
def get_slice_dataset(
27+
def open_slice_source(
2828
ctx: Context,
2929
slice_obj: SliceObj | SliceFactory | Any,
3030
slice_index: int = 0,
3131
) -> SliceSource:
32-
"""Get the slice source for given slice object `slice_obj`.
32+
"""Open the slice source for given slice object `slice_obj`.
3333
3434
The intended and only use of the returned slice source is as context
3535
manager. When used as context manager the slice source yields a slice

0 commit comments

Comments
 (0)