From 1e7829b965325512dfcbc13b603e393001af73a9 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 24 Aug 2023 12:54:38 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .github/workflows/test_and_deploy.yml | 2 +- MANIFEST.in | 2 +- cellfinder/napari/detect/detect.py | 2 +- cellfinder/napari/detect/thread_worker.py | 3 ++- cellfinder/napari/train/train.py | 2 +- cellfinder/napari/train/train_containers.py | 4 ++-- tests/napari/test_train_containers.py | 2 +- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index bd5d4d45..ccbf9950 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -3,7 +3,7 @@ name: tests on: # Only run on pushes to main, or when version tags are pushed push: - branches: + branches: - "main" tags: - "v**" diff --git a/MANIFEST.in b/MANIFEST.in index a1b22eed..145bfb8b 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -14,4 +14,4 @@ graft cellfinder prune benchmarks prune examples prune resources -prune tests \ No newline at end of file +prune tests diff --git a/cellfinder/napari/detect/detect.py b/cellfinder/napari/detect/detect.py index a6281e9c..396f90b6 100644 --- a/cellfinder/napari/detect/detect.py +++ b/cellfinder/napari/detect/detect.py @@ -3,12 +3,12 @@ from typing import Optional import napari -from cellfinder.core.classify.cube_generator import get_cube_depth_min_max from magicgui import magicgui from magicgui.widgets import FunctionGui, ProgressBar from napari.utils.notifications import show_info from qtpy.QtWidgets import QScrollArea +from cellfinder.core.classify.cube_generator import get_cube_depth_min_max from cellfinder.napari.utils import ( add_layers, header_label_widget, diff --git a/cellfinder/napari/detect/thread_worker.py b/cellfinder/napari/detect/thread_worker.py index 93ef7953..ea44dded 100644 --- a/cellfinder/napari/detect/thread_worker.py +++ b/cellfinder/napari/detect/thread_worker.py @@ -1,7 +1,8 @@ -from cellfinder.core.main import main as cellfinder_run from napari.qt.threading import WorkerBase, WorkerBaseSignals from qtpy.QtCore import Signal +from cellfinder.core.main import main as cellfinder_run + from .detect_containers import ( ClassificationInputs, DataInputs, diff --git a/cellfinder/napari/train/train.py b/cellfinder/napari/train/train.py index 4a856112..54d985a4 100644 --- a/cellfinder/napari/train/train.py +++ b/cellfinder/napari/train/train.py @@ -1,12 +1,12 @@ from pathlib import Path from typing import Optional -from cellfinder.core.train.train_yml import run as train_yml from magicgui import magicgui from magicgui.widgets import FunctionGui, PushButton from napari.qt.threading import thread_worker from napari.utils.notifications import show_info +from cellfinder.core.train.train_yml import run as train_yml from cellfinder.napari.utils import ( header_label_widget, html_label_widget, diff --git a/cellfinder/napari/train/train_containers.py b/cellfinder/napari/train/train_containers.py index ad42e58d..73c6ae1e 100644 --- a/cellfinder/napari/train/train_containers.py +++ b/cellfinder/napari/train/train_containers.py @@ -2,10 +2,10 @@ from pathlib import Path from typing import Optional -from cellfinder.core.download.models import model_weight_urls -from cellfinder.core.train.train_yml import models from magicgui.types import FileDialogMode +from cellfinder.core.download.models import model_weight_urls +from cellfinder.core.train.train_yml import models from cellfinder.napari.input_container import InputContainer from cellfinder.napari.utils import html_label_widget diff --git a/tests/napari/test_train_containers.py b/tests/napari/test_train_containers.py index 0e851607..57efaad8 100644 --- a/tests/napari/test_train_containers.py +++ b/tests/napari/test_train_containers.py @@ -1,8 +1,8 @@ from inspect import signature import pytest -from cellfinder.core.train.train_yml import run +from cellfinder.core.train.train_yml import run from cellfinder.napari.train.train_containers import ( MiscTrainingInputs, OptionalNetworkInputs,