diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f546eeb9..ad80a85e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -13,7 +13,7 @@ repos: additional_dependencies: [numpy>=1.23] exclude: docs - repo: https://github.com/psf/black-pre-commit-mirror - rev: 25.12.0 + rev: 26.1.0 hooks: - id: black additional_dependencies: [toml] @@ -49,7 +49,7 @@ repos: hooks: - id: blacken-docs - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.14.10 + rev: v0.15.1 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] diff --git a/src/napari_spatialdata/_scatterwidgets.py b/src/napari_spatialdata/_scatterwidgets.py index 85fbf601..42bbb58b 100644 --- a/src/napari_spatialdata/_scatterwidgets.py +++ b/src/napari_spatialdata/_scatterwidgets.py @@ -251,14 +251,12 @@ def __init__(self, model: DataModel, color_data: dict[str, Any]): color_button = ColorButton(color=color) color_button.setMinimumSize(60, 30) color_button.setMaximumSize(60, 30) - color_button.setStyleSheet( - """ + color_button.setStyleSheet(""" QPushButton { background-color: transparent; border: none; } - """ - ) + """) self.color_buttons[obj_category] = color_button @@ -384,8 +382,7 @@ def __init__(self, viewer: Viewer | None, model: DataModel) -> None: self.drawing_mode_button = QPushButton(self) self.drawing_mode_button.setIcon(QIcon(str(Path(__file__).parent / "resources/icons8-polygon-80.png"))) self.drawing_mode_button.setIconSize(QSize(24, 24)) - self.drawing_mode_button.setStyleSheet( - f""" + self.drawing_mode_button.setStyleSheet(f""" QPushButton {{ background-color: transparent; border: none; @@ -393,8 +390,7 @@ def __init__(self, viewer: Viewer | None, model: DataModel) -> None: QPushButton:checked {{ border: 1px solid rgb{self.color}; }} - """ - ) + """) self.drawing_mode_button.setCheckable(True) self.drawing_mode_button.clicked.connect(self.toggle_drawing_mode) self.drawing_mode_button.setToolTip("Add freehand ROIs.") @@ -405,8 +401,7 @@ def __init__(self, viewer: Viewer | None, model: DataModel) -> None: self.rectangle_mode_button = QPushButton(self) self.rectangle_mode_button.setIcon(QIcon(str(Path(__file__).parent / "resources/icons8-rectangle-48.png"))) self.rectangle_mode_button.setIconSize(QSize(24, 24)) - self.rectangle_mode_button.setStyleSheet( - f""" + self.rectangle_mode_button.setStyleSheet(f""" QPushButton {{ background-color: transparent; border: none; @@ -414,8 +409,7 @@ def __init__(self, viewer: Viewer | None, model: DataModel) -> None: QPushButton:checked {{ border: 1px solid rgb{self.color}; }} - """ - ) + """) self.rectangle_mode_button.setCheckable(True) self.rectangle_mode_button.clicked.connect(self.toggle_rectangle_mode) self.rectangle_mode_button.setToolTip("Add rectangular ROIs.") @@ -873,14 +867,12 @@ def wrap_discrete_color_widget(self) -> QtWidgets.QGraphicsProxyWidget: # view.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn) # sets stle of the vertical slider view.setStyleSheet(get_current_stylesheet()) - view.setStyleSheet( - """ + view.setStyleSheet(""" QGraphicsView { border: none; background: rgb(0, 0, 0); } - """ - ) + """) view.setSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) diff --git a/src/napari_spatialdata/_widgets.py b/src/napari_spatialdata/_widgets.py index d4f130bf..9be7b1cf 100644 --- a/src/napari_spatialdata/_widgets.py +++ b/src/napari_spatialdata/_widgets.py @@ -24,13 +24,14 @@ from vispy import scene from vispy.color.colormap import Colormap, MatplotlibColormap from vispy.scene.widgets import ColorBarWidget + # See https://github.com/scverse/squidpy/issues/1061 for more details. # Scanpy 0.11.x-0.12.x renamed set_default_colors_for_categorical_obs to _set_default_colors_for_categorical_obs # and then changed it back. Try underscore version first, fall back to non-underscore. try: from scanpy.plotting._utils import _set_default_colors_for_categorical_obs as set_default_colors_for_categorical_obs except ImportError: - from scanpy.plotting._utils import set_default_colors_for_categorical_obs + pass # See https://github.com/scverse/squidpy/issues/1061 for more details. # Scanpy 0.11.x-0.12.x renamed set_default_colors_for_categorical_obs to _set_default_colors_for_categorical_obs