Skip to content

Commit 96922d8

Browse files
author
Ruben Verweij
committed
3.0.9
1 parent da10f6d commit 96922d8

6 files changed

Lines changed: 9 additions & 17 deletions

File tree

docs

Submodule docs updated from 9d18331 to 1b43456

nd2reader/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
from nd2reader.reader import ND2Reader
22
from nd2reader.legacy import Nd2
33

4-
__version__ = '3.0.8'
4+
__version__ = '3.0.9'

nd2reader/parser.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,14 @@ def _check_version_supported(self):
116116
117117
Returns:
118118
bool: True on supported
119-
120-
Raises:
121-
InvalidVersionError: Raises an error if the version is unsupported
122-
123119
"""
124120
major_version, minor_version = get_version(self._fh)
125121
supported = self.supported_file_versions.get(
126122
(major_version, minor_version)) or self.supported_file_versions.get((major_version, None))
127123

128124
if not supported:
129-
raise InvalidVersionError("No parser is available for that version.")
125+
print("Warning: No parser is available for your current ND2 version (%d.%d). " % (
126+
major_version, minor_version) + "This might lead to unexpected behaviour.")
130127

131128
return supported
132129

@@ -229,7 +226,7 @@ def _calculate_frame_number(self, image_group_number, field_of_view, z_level):
229226
230227
"""
231228
return (image_group_number - (field_of_view * len(self.metadata["z_levels"]) + z_level)) / (
232-
len(self.metadata["fields_of_view"]) * len(self.metadata["z_levels"]))
229+
len(self.metadata["fields_of_view"]) * len(self.metadata["z_levels"]))
233230

234231
@property
235232
def _channel_offset(self):

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from setuptools import setup
22

3-
VERSION = '3.0.8'
3+
VERSION = '3.0.9'
44

55
if __name__ == '__main__':
66
setup(

sphinx/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
# built documents.
4545
#
4646
# The short X.Y version.
47-
version = '3.0.8'
47+
version = '3.0.9'
4848
# The full version, including alpha/beta/rc tags.
49-
release = '3.0.8'
49+
release = '3.0.9'
5050

5151
# The language for content autogenerated by Sphinx. Refer to documentation
5252
# for a list of supported languages.

tests/test_parser.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,4 @@ def test_can_open_test_file(self):
2424
parser = Parser(fh)
2525
self.assertTrue(parser.supported)
2626

27-
def test_cannot_open_wrong_version(self):
28-
with ArtificialND2(self.test_file, version=('0', '0')) as _:
29-
with open(self.test_file, 'rb') as fh:
30-
with self.assertRaises(InvalidVersionError) as exception:
31-
Parser(fh)
32-
self.assertEqual(str(exception.exception), "No parser is available for that version.")
27+

0 commit comments

Comments
 (0)