diff options
| -rw-r--r-- | bsie/apps/info.py | 4 | ||||
| -rw-r--r-- | bsie/reader/image/__init__.py | 3 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | test/reader/image/test_image.py | 5 | ||||
| -rw-r--r-- | test/reader/image/test_raw_image.py | 5 |
5 files changed, 16 insertions, 3 deletions
diff --git a/bsie/apps/info.py b/bsie/apps/info.py index cd28685..5b6fb0e 100644 --- a/bsie/apps/info.py +++ b/bsie/apps/info.py @@ -33,6 +33,10 @@ def main(argv): # FIXME: Read reader/extractor configs from a config file # reader builder rbuild = ReaderBuilder({ + 'bsie.reader.image.Image': { + 'bsie.reader.image._raw.RawImage': { + } + } }) # extractor builder ebuild = ExtractorBuilder([ diff --git a/bsie/reader/image/__init__.py b/bsie/reader/image/__init__.py index 85dad85..b7587e7 100644 --- a/bsie/reader/image/__init__.py +++ b/bsie/reader/image/__init__.py @@ -27,7 +27,8 @@ __all__: typing.Sequence[str] = ( ## code ## -class Image(chain.ReaderChain[PIL.Image]): # pylint: disable=too-few-public-methods +# FIXME: Check if PIL.Image or PIL.Image.Image, or if version-dependent +class Image(chain.ReaderChain[PIL.Image.Image]): # pylint: disable=too-few-public-methods """Read an image file.""" def __init__(self, cfg): @@ -25,6 +25,8 @@ setup( extra_require=( # image reader 'pillow', 'rawpy', + # image extractors + 'numpy', ) ) diff --git a/test/reader/image/test_image.py b/test/reader/image/test_image.py index c60ca75..26f6a93 100644 --- a/test/reader/image/test_image.py +++ b/test/reader/image/test_image.py @@ -20,7 +20,10 @@ from bsie.reader.image import Image class TestImage(unittest.TestCase): def setUp(self): - importlib.import_module(__package__ + '.load_nef').get() + if __package__ is None or __package__ == '': # direct call or local discovery + importlib.import_module('load_nef', __package__).get() + else: # parent discovery + importlib.import_module('.load_nef', __package__).get() def test_construct(self): image = Image({}) diff --git a/test/reader/image/test_raw_image.py b/test/reader/image/test_raw_image.py index 3d5f887..ba21b5a 100644 --- a/test/reader/image/test_raw_image.py +++ b/test/reader/image/test_raw_image.py @@ -23,7 +23,10 @@ from bsie.reader.image._raw import RawImage class TestRawImage(unittest.TestCase): def setUp(self): - importlib.import_module(__package__ + '.load_nef').get() + if __package__ is None or __package__ == '': # direct call or local discovery + importlib.import_module('load_nef', __package__).get() + else: # parent discovery + importlib.import_module('.load_nef', __package__).get() def test_call(self): rdr = RawImage() |