Fix dependencies sort order

.github/workflows/pythontest.yaml

@@ -28,7 +28,7 @@ jobs:
           enable-cache: true
           cache-dependency-glob: "uv.lock"
       - name: Install dependencies
-        run: uv sync --group lint
+        run: uv sync --group lint --all-extras
       - name: Lint with ruff
         run: uv run ruff check .
   test:

conftest.py

@@ -5,6 +5,7 @@
 from contextlib import suppress
 
 import pytest
+
 from panoptes.utils.config.client import set_config
 from panoptes.utils.config.server import config_server
 

pyproject.toml

@@ -192,6 +192,21 @@ select = [
 ]
 ignore = []
 
+[tool.ruff.lint.isort]
+section-order = [
+    "future",
+    "standard-library",
+    "third-party",
+    "first-party",
+    "local-folder",
+    "panoptes-utils",
+    "panoptes-pocs"
+]
+
+[tool.ruff.lint.isort.sections]
+"panoptes-utils" = ["panoptes.utils"]
+"panoptes-pocs" = ["panoptes.pocs"]
+
 [tool.ruff.format]
 quote-style = "double"
 indent-style = "space"

src/panoptes/pocs/base.py

@@ -7,9 +7,10 @@
 import os
 from typing import Any
 
+from requests.exceptions import ConnectionError
+
 from panoptes.utils.config import client
 from panoptes.utils.database import PanDB
-from requests.exceptions import ConnectionError
 
 from panoptes.pocs import __version__, hardware
 from panoptes.pocs.utils.logger import get_logger

src/panoptes/pocs/camera/__init__.py

@@ -6,10 +6,11 @@
 from contextlib import suppress
 
 import requests
+from pydantic import AnyHttpUrl
+
 from panoptes.utils import error
 from panoptes.utils.config.client import get_config
 from panoptes.utils.library import load_module
-from pydantic import AnyHttpUrl
 
 from panoptes.pocs.camera.camera import AbstractCamera  # noqa
 from panoptes.pocs.utils.logger import get_logger

src/panoptes/pocs/camera/camera.py

@@ -18,6 +18,7 @@
 import astropy.units as u
 from astropy.io import fits
 from astropy.time import Time
+
 from panoptes.utils import error
 from panoptes.utils.images import fits as fits_utils
 from panoptes.utils.images.misc import crop_data

src/panoptes/pocs/camera/fli.py

@@ -9,6 +9,7 @@
 import numpy as np
 from astropy import units as u
 from astropy.io import fits
+
 from panoptes.utils import error
 
 from panoptes.pocs.camera import libfliconstants as c

src/panoptes/pocs/camera/gphoto/canon.py

@@ -8,6 +8,7 @@
 from functools import lru_cache
 
 from astropy import units as u
+
 from panoptes.utils import error
 from panoptes.utils.error import PanError
 from panoptes.utils.time import current_time

src/panoptes/pocs/camera/libasi.py

@@ -10,6 +10,7 @@
 
 import numpy as np
 from astropy import units as u
+
 from panoptes.utils import error
 from panoptes.utils.utils import get_quantity_value
 

src/panoptes/pocs/camera/libfli.py

@@ -9,6 +9,7 @@
 
 import numpy as np
 from astropy import units as u
+
 from panoptes.utils import error
 from panoptes.utils.utils import get_quantity_value
 

src/panoptes/pocs/camera/sbig.py

@@ -7,6 +7,7 @@
 from contextlib import suppress
 
 from astropy.io import fits
+
 from panoptes.utils import error
 
 from panoptes.pocs.camera.sbigudrv import INVALID_HANDLE_VALUE, SBIGDriver

src/panoptes/pocs/camera/sbigudrv.py

@@ -17,6 +17,7 @@
 import numpy as np
 from astropy import units as u
 from numpy.ctypeslib import as_ctypes
+
 from panoptes.utils import error
 from panoptes.utils.time import CountdownTimer
 from panoptes.utils.utils import get_quantity_value

src/panoptes/pocs/camera/sdk.py

@@ -9,6 +9,7 @@
 from contextlib import suppress
 
 from astropy.io import fits
+
 from panoptes.utils import error
 from panoptes.utils.library import load_c_library
 

src/panoptes/pocs/camera/simulator/ccd.py

@@ -12,6 +12,7 @@
 from contextlib import suppress
 
 import astropy.units as u
+
 from panoptes.utils.config.client import get_config
 
 from panoptes.pocs.camera.sdk import AbstractSDKCamera, AbstractSDKDriver

src/panoptes/pocs/camera/simulator/dslr.py

@@ -11,6 +11,7 @@
 import numpy as np
 from astropy import units as u
 from astropy.io import fits
+
 from panoptes.utils.images import fits as fits_utils
 from panoptes.utils.time import CountdownTimer
 from panoptes.utils.utils import get_quantity_value

src/panoptes/pocs/camera/zwo.py

@@ -13,6 +13,7 @@
 from astropy import units as u
 from astropy.io import fits
 from astropy.time import Time
+
 from panoptes.utils import error
 from panoptes.utils.utils import get_quantity_value
 

src/panoptes/pocs/core.py

@@ -11,6 +11,7 @@
 
 from astropy import units as u
 from astropy.time import Time
+
 from panoptes.utils.time import CountdownTimer, current_time
 from panoptes.utils.utils import get_free_space
 

src/panoptes/pocs/dome/protocol_astrohaven_simulator.py

@@ -10,9 +10,10 @@
 import threading
 import time
 
-from panoptes.utils.serial.handlers.protocol_no_op import NoOpSerial
 from serial import serialutil
 
+from panoptes.utils.serial.handlers.protocol_no_op import NoOpSerial
+
 from panoptes.pocs.dome import astrohaven
 from panoptes.pocs.utils.logger import get_logger
 
@@ -338,7 +339,7 @@ def write(self, data):
             SerialTimeoutException: In case a write timeout is configured for
                 the port and the time is exceeded.
         """
-        if not isinstance(data, (bytes, bytearray)):
+        if not isinstance(data, bytes | bytearray):
             raise ValueError("write takes bytes")
         data = bytes(data)  # Make sure it can't change.
         self.logger.info(f"AstrohavenSerialSimulator.write({data!r})")

src/panoptes/pocs/filterwheel/filterwheel.py

@@ -10,6 +10,7 @@
 from contextlib import suppress
 
 from astropy import units as u
+
 from panoptes.utils import error
 from panoptes.utils.utils import listify
 

src/panoptes/pocs/filterwheel/simulator.py

@@ -10,6 +10,7 @@
 import threading
 
 from astropy import units as u
+
 from panoptes.utils import error
 
 from panoptes.pocs.filterwheel import AbstractFilterWheel

src/panoptes/pocs/filterwheel/zwo.py

@@ -7,6 +7,7 @@
 from contextlib import suppress
 
 from astropy import units as u
+
 from panoptes.utils import error
 
 from panoptes.pocs.camera.camera import AbstractCamera

src/panoptes/pocs/focuser/birger.py

@@ -10,6 +10,7 @@
 from contextlib import suppress
 
 import serial
+
 from panoptes.utils import error
 
 from panoptes.pocs.focuser.serial import AbstractSerialFocuser

src/panoptes/pocs/focuser/focuser.py

@@ -12,10 +12,11 @@
 
 import numpy as np
 from astropy.modeling import fitting, models
+from scipy.ndimage import binary_dilation
+
 from panoptes.utils.images import focus as focus_utils
 from panoptes.utils.images.misc import mask_saturated
 from panoptes.utils.time import current_time
-from scipy.ndimage import binary_dilation
 
 from panoptes.pocs.base import PanBase
 from panoptes.pocs.utils.plotting import make_autofocus_plot

src/panoptes/pocs/images.py

@@ -13,6 +13,7 @@
 from astropy.coordinates import FK5, EarthLocation, SkyCoord
 from astropy.io import fits
 from astropy.time import Time
+
 from panoptes.utils.images import fits as fits_utils
 
 from panoptes.pocs.base import PanBase

src/panoptes/pocs/mount/bisque.py

@@ -12,6 +12,7 @@
 
 from astropy import units as u
 from astropy.coordinates import SkyCoord
+
 from panoptes.utils import error
 
 from panoptes.pocs.mount import AbstractMount

src/panoptes/pocs/mount/ioptron/base.py

@@ -11,6 +11,7 @@
 from astropy.coordinates import Latitude, Longitude, SkyCoord
 from astropy.coordinates.earth import EarthLocation
 from astropy.time import Time
+
 from panoptes.utils import error as error
 from panoptes.utils.time import current_time
 

src/panoptes/pocs/mount/mount.py

@@ -13,6 +13,7 @@
 
 from astropy import units as u
 from astropy.coordinates import EarthLocation, SkyCoord
+
 from panoptes.utils import error
 from panoptes.utils.serializers import from_yaml
 from panoptes.utils.time import CountdownTimer, current_time

src/panoptes/pocs/mount/simulator.py

@@ -8,6 +8,7 @@
 from threading import Timer
 
 from astropy import units as u
+
 from panoptes.utils import error
 from panoptes.utils.time import current_time
 

src/panoptes/pocs/observatory.py

@@ -14,6 +14,7 @@
 from astropy import units as u
 from astropy.coordinates import get_body
 from astropy.io.fits import setval
+
 from panoptes.utils import error
 from panoptes.utils import images as img_utils
 from panoptes.utils.images import fits as fits_utils

src/panoptes/pocs/scheduler/constraint.py

@@ -12,6 +12,7 @@
 from astropy import units as u
 from astropy.time import Time
 from dateutil.parser import parse as parse_date
+
 from panoptes.utils import error
 from panoptes.utils import horizon as horizon_utils
 from panoptes.utils.utils import get_quantity_value
@@ -80,7 +81,7 @@ def __init__(self, horizon=None, obstructions=None, *args, **kwargs):
 
         if isinstance(horizon, horizon_utils.Horizon):
             self.horizon_line = horizon.horizon_line
-        elif horizon is None or isinstance(horizon, (int, float, u.Quantity)):
+        elif horizon is None or isinstance(horizon, int | float | u.Quantity):
             obstruction_list = obstructions
             default_horizon = horizon
 

src/panoptes/pocs/scheduler/field.py

@@ -6,6 +6,7 @@
 
 from astroplan import FixedTarget
 from astropy.coordinates import SkyCoord
+
 from panoptes.utils.time import current_time
 from panoptes.utils.utils import altaz_to_radec
 

src/panoptes/pocs/scheduler/observation/base.py

@@ -10,10 +10,11 @@
 from pathlib import Path
 
 from astropy import units as u
+from pydantic.dataclasses import dataclass
+
 from panoptes.utils import error
 from panoptes.utils.library import load_module
 from panoptes.utils.utils import get_quantity_value, listify
-from pydantic.dataclasses import dataclass
 
 from panoptes.pocs.base import PanBase
 from panoptes.pocs.scheduler import create_constraints_from_config

src/panoptes/pocs/scheduler/observation/bias.py

@@ -7,6 +7,7 @@
 import os
 
 from astropy import units as u
+
 from panoptes.utils.config.client import get_config
 
 from panoptes.pocs.scheduler.field import Field

src/panoptes/pocs/scheduler/observation/compound.py

@@ -2,6 +2,7 @@
 
 import numpy as np
 from astropy import units as u
+
 from panoptes.utils.utils import get_quantity_value, listify
 
 from panoptes.pocs.scheduler.observation.base import Observation as BaseObservation

src/panoptes/pocs/scheduler/observation/dark.py

@@ -7,6 +7,7 @@
 import os
 
 from astropy import units as u
+
 from panoptes.utils.utils import get_quantity_value, listify
 
 from panoptes.pocs.scheduler.field import Field

src/panoptes/pocs/scheduler/scheduler.py

@@ -14,6 +14,7 @@
 from astroplan import Observer
 from astropy import units as u
 from astropy.coordinates import get_body
+
 from panoptes.utils import error
 from panoptes.utils.serializers import from_yaml
 from panoptes.utils.time import current_time

src/panoptes/pocs/sensor/power.py

@@ -15,6 +15,7 @@
 
 import pandas as pd
 from astropy import units as u
+
 from panoptes.utils import error
 from panoptes.utils.serial.device import SerialDevice, find_serial_port
 from panoptes.utils.serializers import from_json, to_json

src/panoptes/pocs/sensor/remote.py

@@ -5,6 +5,7 @@
 """
 
 import requests
+
 from panoptes.utils import error
 from panoptes.utils.config.client import get_config
 from panoptes.utils.time import current_time

src/panoptes/pocs/state/machine.py

@@ -1,13 +1,14 @@
 from contextlib import suppress
 from pathlib import Path
 
+from transitions import Machine
+from transitions.extensions.states import Tags as MachineState
+
 from panoptes.utils import error
 from panoptes.utils.config.client import get_config
 from panoptes.utils.library import load_module
 from panoptes.utils.serializers import from_yaml
 from panoptes.utils.utils import listify
-from transitions import Machine
-from transitions.extensions.states import Tags as MachineState
 
 
 class PanStateMachine(Machine):

src/panoptes/pocs/state/states/default/pointing.py

@@ -5,6 +5,7 @@
 """
 
 import numpy as np
+
 from panoptes.utils.time import wait_for_events
 
 from panoptes.pocs.images import Image

src/panoptes/pocs/state/states/default/ready.py

@@ -5,6 +5,7 @@
 """
 
 from astropy import units as u
+
 from panoptes.utils.time import current_time