diff --git a/src/imglyb/OSXAWTwrapper.py b/src/imglyb/OSXAWTwrapper.py index 1057755..883cdb6 100644 --- a/src/imglyb/OSXAWTwrapper.py +++ b/src/imglyb/OSXAWTwrapper.py @@ -17,7 +17,6 @@ import os import sys - usage = ( "usage: python OSXAWTwrapper.py " "[module name | script path] " @@ -68,13 +67,13 @@ def runAwtStuff(): def main(): try: import objc - from PyObjCTools import AppHelper from AppKit import ( - NSApplication, NSApp, - NSObject, + NSApplication, NSApplicationActivationPolicyRegular, + NSObject, ) + from PyObjCTools import AppHelper # from Foundation import * diff --git a/src/imglyb/__init__.py b/src/imglyb/__init__.py index 5c6bde6..0887867 100644 --- a/src/imglyb/__init__.py +++ b/src/imglyb/__init__.py @@ -1,11 +1,12 @@ -from functools import lru_cache import logging +from functools import lru_cache from typing import Any, Callable, Dict import scyjava import scyjava.config as sjconf -from .config import get_imglib2_imglyb_version, version as __version__ # noqa: F401 +from .config import get_imglib2_imglyb_version +from .config import version as __version__ # noqa: F401 from .imglib_ndarray import ImgLibReferenceGuard as _ImgLibReferenceGuard from .ndarray_like_as_img import ( as_cell_img, diff --git a/src/imglyb/imglib_ndarray.py b/src/imglyb/imglib_ndarray.py index 358e1d5..86b533f 100644 --- a/src/imglyb/imglib_ndarray.py +++ b/src/imglyb/imglib_ndarray.py @@ -1,7 +1,7 @@ import ctypes -import numpy as np import jpype +import numpy as np import scyjava from imglyb import util diff --git a/src/imglyb/ndarray_like_as_img.py b/src/imglyb/ndarray_like_as_img.py index 89f5ac0..0315724 100644 --- a/src/imglyb/ndarray_like_as_img.py +++ b/src/imglyb/ndarray_like_as_img.py @@ -1,17 +1,13 @@ import logging import math + import numpy as np import scyjava - from jpype import JException, JImplements, JOverride -from . import accesses -from . import caches -from . import types -from . import util +from . import accesses, caches, types, util from .reference_store import ReferenceStore - _global_reference_store = ReferenceStore() _logger = logging.getLogger(__name__) diff --git a/src/imglyb/util.py b/src/imglyb/util.py index 4dfc5f3..0f047cc 100644 --- a/src/imglyb/util.py +++ b/src/imglyb/util.py @@ -2,8 +2,7 @@ import numpy as np import scyjava - -from jpype import JImplements, JOverride, JLong, JArray +from jpype import JArray, JImplements, JLong, JOverride _logger = logging.getLogger(__name__) diff --git a/tests/test_imglyb.py b/tests/test_imglyb.py index 0a8019a..249375f 100644 --- a/tests/test_imglyb.py +++ b/tests/test_imglyb.py @@ -1,9 +1,9 @@ -from jpype import JArray, JInt, JLong -import pytest -import imglyb import numpy as np +import pytest import scyjava +from jpype import JArray, JInt, JLong +import imglyb from imglyb.imglib_ndarray import NumpyView diff --git a/tests/test_version.py b/tests/test_version.py index fd372ef..a14d7ea 100644 --- a/tests/test_version.py +++ b/tests/test_version.py @@ -1,9 +1,9 @@ from pathlib import Path +import scyjava import toml import imglyb -import scyjava def _expected_version():