Merge pull request #2542 from dhomeier/proper-assert-proper-roi

Author: astrofrog

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ ci:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: check-added-large-files
         args: ["--enforce-all", "--maxkb=300"]
@@ -51,7 +51,7 @@ repos:
         # Forbid files which have a UTF-8 Unicode replacement character.
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.9.9"
+    rev: "v0.11.12"
     hooks:
       - id: ruff
         args: ["--fix", "--show-fixes"]

.ruff.toml

@@ -1,7 +1,7 @@
 extend = "pyproject.toml"
 lint.ignore = [
     # NOTE: to find a good code to fix, run:
-    # ruff --select="ALL" --statistics glue/<subpackage>
+    # ruff check --select="ALL" --statistics glue/<subpackage>
 
     # flake8-unused-arguments (ARG)
     "ARG001",  # unused-function-argument

glue/core/component.py

@@ -16,6 +16,8 @@
 __all__ = ['Component', 'DerivedComponent', 'CategoricalComponent',
            'CoordinateComponent', 'DateTimeComponent', 'ExtendedComponent']
 
+logger = logging.getLogger(__name__)
+
 
 class Component(object):
 
@@ -80,7 +82,7 @@ def ndim(self):
         return len(self._data.shape)
 
     def __getitem__(self, key):
-        logging.debug("Using %s to index data of shape %s", key, self.shape)
+        logger.debug("Using %s to index data of shape %s", key, self.shape)
         return self._data[key]
 
     @property

glue/core/state.py

@@ -92,6 +92,8 @@ def load(rec, context)
 if MATPLOTLIB_GE_36:
     from matplotlib import colormaps
 
+logger = logging.getLogger(__name__)
+
 literals = tuple([type(None), float, int, bytes, bool])
 literals += tuple(s for s in np.ScalarType if s not in (np.datetime64, np.timedelta64))
 
@@ -312,7 +314,7 @@ def id(self, obj):
         name = self._label(obj)
         assert name not in self._objs
 
-        logging.debug("Registering %r as %s", obj, name)
+        logger.debug("Registering %r as %s", obj, name)
         self._objs[name] = obj
         self._names[oid] = name
 
@@ -354,7 +356,7 @@ def do(self, obj):
         self._working.add(oid)
 
         fun, version = self._dispatch(obj)
-        logging.debug("Serializing %s with %s", obj, fun)
+        logger.debug("Serializing %s with %s", obj, fun)
         result = fun(obj, self)
 
         if isinstance(obj, types.FunctionType):

glue/core/tests/test_roi.py

@@ -1216,7 +1216,7 @@ def _roi_factory(self):
         return MplPolygonalROI(self.axes)
 
     def test_proper_roi(self):
-        return isinstance(self.roi._roi, PolygonalROI)
+        assert isinstance(self.roi._roi, PolygonalROI)
 
     def send_events(self):
         ev0 = DummyEvent(5, 5, inaxes=self.axes)
@@ -1271,7 +1271,7 @@ def _roi_factory(self):
         return MplPickROI(self.axes)
 
     def test_proper_roi(self):
-        return isinstance(self.roi._roi, PointROI)
+        assert isinstance(self.roi._roi, PointROI)
 
     def test_start_ignored_if_not_inaxes(self):
         ev = DummyEvent(0, 0, inaxes=None)

glue/utils/matplotlib.py

@@ -18,6 +18,8 @@
 MATPLOTLIB_GE_30 = Version(__version__) >= Version('3')
 MATPLOTLIB_GE_36 = Version(__version__) >= Version('3.6')
 
+logger = logging.getLogger(__name__)
+
 
 __all__ = ['all_artists', 'new_artists', 'remove_artists',
            'get_extent', 'view_cascade', 'fast_limits', 'defer_draw',
@@ -97,7 +99,7 @@ def view_cascade(data, view):
     """
     shp = data.shape
     v2 = list(view)
-    logging.debug("image shape: %s, view: %s", shp, view)
+    logger.debug("image shape: %s, view: %s", shp, view)
 
     # choose stride length that roughly samples entire image
     # at roughly the same pixel count