Update deps & add ruff isort to pre-commit

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -9,12 +9,15 @@ repos:
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.1.14
+    rev: v0.6.7
     hooks:
       - id: ruff
+      - id: ruff
+        args: [--select, I, --fix]
+        name: ruff-isort
       - id: ruff-format
 
   - repo: https://github.com/adrienverge/yamllint
-    rev: v1.33.0
+    rev: v1.35.1
     hooks:
       - id: yamllint

pyproject.toml

@@ -62,7 +62,12 @@ exclude_lines = [
 exclude = [
     "__init__.py",
 ]
+line-length = 110
+target-version = "py311"
+
+[tool.ruff.lint]
 ignore = [
+    "COM812",
     "N802",
     "N803",
     "N806",
@@ -71,7 +76,6 @@ ignore = [
     "N815",
     "N816",
 ]
-line-length = 110
 select = [
     "E",  # pycodestyle
     "F",  # pyflakes
@@ -81,18 +85,17 @@ select = [
     "FBT", # flake8-boolean-trap
     "UP", # pyupgrade
 ]
-target-version = "py311"
 extend-select = [
     "RUF100", # Warn about unused noqa
 ]
 
 [tool.ruff.lint.isort]
 known-first-party = ["lsst", "tests"]
 
-[tool.ruff.pycodestyle]
+[tool.ruff.lint.pycodestyle]
 max-doc-length = 79
 
-[tool.ruff.pydocstyle]
+[tool.ruff.lint.pydocstyle]
 convention = "numpy"
 
 [tool.pytest.ini_options]

requirements/dev.in

@@ -9,16 +9,17 @@
 aiosqlite
 asgi-lifespan
 coverage[toml]
+greenlet==3.0.3  # Pin back to allow playwright 1.47
 httpx
 mypy
 pre-commit
 pylint
 pytest
 pytest-asyncio
 pytest-cov
+pytest-playwright
 pytest-timeout
 ruff
 sqlalchemy[mypy]
 types-pyyaml
 types-tabulate
-pytest-playwright

requirements/main.in

@@ -14,6 +14,7 @@ uvicorn[standard]
 # Other dependencies.
 asyncpg
 click
+greenlet==3.0.3  # Pin back to allow playwright 1.47
 jinja2
 lsst-ctrl-bps
 lsst-ctrl-bps-panda

src/lsst/cmservice/cli/campaign.py

@@ -1,4 +1,5 @@
 """CLI to manage Campaign table"""
+
 from .. import db
 from . import options, wrappers
 from .commands import campaign_group

src/lsst/cmservice/cli/group.py

@@ -1,4 +1,5 @@
 """CLI to manage Group table"""
+
 from .. import db
 from ..client.client import CMClient
 from . import options, wrappers

src/lsst/cmservice/cli/job.py

@@ -1,6 +1,7 @@
 """CLI to manage Job table"""
-from ..client.client import CMClient
+
 from .. import db
+from ..client.client import CMClient
 from . import options, wrappers
 from .commands import job_group
 

src/lsst/cmservice/cli/pipetask_error_type.py

@@ -1,4 +1,5 @@
 """CLI to manage PipetaskErrorType table"""
+
 from .. import db
 from . import options, wrappers
 from .commands import pipetask_error_type_group

src/lsst/cmservice/cli/product_set.py

@@ -1,4 +1,5 @@
 """CLI to manage ProductSet table"""
+
 from .. import db
 from . import options, wrappers
 from .commands import product_set_group

src/lsst/cmservice/cli/production.py

@@ -1,4 +1,5 @@
 """CLI to manage Production table"""
+
 from .. import db
 from . import options, wrappers
 from .commands import production_group

src/lsst/cmservice/cli/queue.py

@@ -1,4 +1,5 @@
 """CLI to manage Queue table"""
+
 from .. import db
 from ..client.client import CMClient
 from . import options, wrappers

src/lsst/cmservice/cli/script.py

@@ -1,4 +1,5 @@
 """CLI to manage Script table"""
+
 from .. import db
 from . import options, wrappers
 from .commands import script_group

src/lsst/cmservice/cli/script_dependency.py

@@ -1,4 +1,5 @@
 """CLI to manage ScriptDependency table"""
+
 from .. import db
 from . import options, wrappers
 from .commands import script_dependency_group

src/lsst/cmservice/cli/script_template.py

@@ -1,4 +1,5 @@
 """CLI to manage ScriptTemplate table"""
+
 from .. import db
 from . import options, wrappers
 from .commands import script_template_group

src/lsst/cmservice/cli/spec_block.py

@@ -1,4 +1,5 @@
 """CLI to manage SpecBlock table"""
+
 from .. import db
 from . import options, wrappers
 from .commands import spec_block_group

src/lsst/cmservice/cli/specificaiton.py

@@ -1,4 +1,5 @@
 """CLI to manage Specification table"""
+
 from .. import db
 from . import options, wrappers
 from .commands import specification_group

src/lsst/cmservice/cli/step.py

@@ -1,4 +1,5 @@
 """CLI to manage Step table"""
+
 from .. import db
 from . import options, wrappers
 from .commands import step_group

src/lsst/cmservice/cli/step_dependency.py

@@ -1,4 +1,5 @@
 """CLI to manage Group table"""
+
 from .. import db
 from . import options, wrappers
 from .commands import step_dependency_group

src/lsst/cmservice/cli/task_set.py

@@ -1,4 +1,5 @@
 """CLI to manage TaskSet table"""
+
 from .. import db
 from . import options, wrappers
 from .commands import task_set_group

src/lsst/cmservice/cli/wms_task_report.py

@@ -1,4 +1,5 @@
 """CLI to manage WmsTaskReport table"""
+
 from .. import db
 from . import options, wrappers
 from .commands import wms_task_report_group

src/lsst/cmservice/client/client.py

@@ -1,4 +1,5 @@
 """Top level for python client API"""
+
 from __future__ import annotations
 
 import httpx

src/lsst/cmservice/client/groups.py

@@ -1,4 +1,5 @@
 """python for client API for managing Group tables"""
+
 from __future__ import annotations
 
 from typing import TYPE_CHECKING

src/lsst/cmservice/client/jobs.py

@@ -1,4 +1,5 @@
 """python for client API for managing Job tables"""
+
 from __future__ import annotations
 
 from collections.abc import Sequence

src/lsst/cmservice/client/loaders.py

@@ -1,22 +1,22 @@
 from __future__ import annotations
 
 import os
-import yaml
-
-from typing import Any, TYPE_CHECKING
 from collections.abc import Mapping
+from typing import TYPE_CHECKING, Any
 
 import httpx
+import yaml
 
+from .. import models
 from ..common.enums import ErrorActionEnum, ErrorFlavorEnum, ErrorSourceEnum
 from ..common.errors import CMYamlParseError
-from .. import models
 from . import wrappers
 
 if TYPE_CHECKING:
-    from .client import CMClient
     from pydantic import BaseModel
 
+    from .client import CMClient
+
 
 def update_include_dict(
     orig_dict: dict[str, Any],

src/lsst/cmservice/client/pipetask_error_types.py

@@ -1,4 +1,5 @@
 """python for client API for managing PipetaskErrorType tables"""
+
 from __future__ import annotations
 
 from typing import TYPE_CHECKING

src/lsst/cmservice/client/pipetask_errors.py

@@ -1,4 +1,5 @@
 """python for client API for managing Group tables"""
+
 from __future__ import annotations
 
 from typing import TYPE_CHECKING

src/lsst/cmservice/client/product_sets.py

@@ -1,4 +1,5 @@
 """python for client API for managing ProductSet tables"""
+
 from __future__ import annotations
 
 from typing import TYPE_CHECKING

src/lsst/cmservice/client/productions.py

@@ -1,4 +1,5 @@
 """python for client API for managing Production tables"""
+
 from __future__ import annotations
 
 from typing import TYPE_CHECKING

src/lsst/cmservice/client/queues.py

@@ -1,4 +1,5 @@
 """python for client API for managing Group tables"""
+
 from __future__ import annotations
 
 from datetime import datetime, timedelta

src/lsst/cmservice/client/script_dependencies.py

@@ -1,4 +1,5 @@
 """python for client API for managing ScriptDependency tables"""
+
 from __future__ import annotations
 
 from typing import TYPE_CHECKING

src/lsst/cmservice/client/script_errors.py

@@ -1,4 +1,5 @@
 """python for client API for managing ScriptError tables"""
+
 from __future__ import annotations
 
 from typing import TYPE_CHECKING

src/lsst/cmservice/client/script_templates.py

@@ -1,4 +1,5 @@
 """python for client API for managing ScriptTemplate tables"""
+
 from __future__ import annotations
 
 from typing import TYPE_CHECKING

src/lsst/cmservice/client/scripts.py

@@ -1,4 +1,5 @@
 """python for client API for managing Script tables"""
+
 from __future__ import annotations
 
 from typing import TYPE_CHECKING

src/lsst/cmservice/client/spec_blocks.py

@@ -1,4 +1,5 @@
 """python for client API for managing SpecBlock tables"""
+
 from __future__ import annotations
 
 from typing import TYPE_CHECKING

src/lsst/cmservice/client/specifications.py

@@ -1,4 +1,5 @@
 """python for client API for managing Specification tables"""
+
 from __future__ import annotations
 
 from typing import TYPE_CHECKING

src/lsst/cmservice/client/step_dependencies.py

@@ -1,4 +1,5 @@
 """python for client API for managing StepDependency tables"""
+
 from __future__ import annotations
 
 from typing import TYPE_CHECKING

src/lsst/cmservice/client/steps.py

@@ -1,4 +1,5 @@
 """python for client API for managing Step tables"""
+
 from __future__ import annotations
 
 from typing import TYPE_CHECKING

src/lsst/cmservice/client/task_sets.py

@@ -1,4 +1,5 @@
 """python for client API for managing TaskSet tables"""
+
 from __future__ import annotations
 
 from typing import TYPE_CHECKING

src/lsst/cmservice/client/wms_task_reports.py

@@ -1,4 +1,5 @@
 """python for client API for managing WmsTaskReport tables"""
+
 from __future__ import annotations
 
 from typing import TYPE_CHECKING

src/lsst/cmservice/common/errors.py

@@ -1,6 +1,5 @@
 """cm-service specific error types"""
 
-
 from sqlalchemy.exc import IntegrityError
 
 

src/lsst/cmservice/common/slurm.py

@@ -1,4 +1,5 @@
 """Utility functions for working with slurm jobs"""
+
 import subprocess
 
 from .enums import StatusEnum

src/lsst/cmservice/db/specification.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-
 from sqlalchemy import JSON
 from sqlalchemy.ext.asyncio import async_scoped_session
 from sqlalchemy.ext.hybrid import hybrid_property

src/lsst/cmservice/handlers/element_handler.py

@@ -12,7 +12,6 @@
 from ..db.node import NodeMixin
 from ..db.script import Script
 from ..db.script_dependency import ScriptDependency
-
 from .functions import add_steps
 
 

src/lsst/cmservice/handlers/functions.py

@@ -6,8 +6,8 @@
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import async_scoped_session
 
-from lsst.ctrl.bps.wms_service import WmsJobReport, WmsStates, WmsRunReport
 from lsst.ctrl.bps.bps_reports import compile_job_summary
+from lsst.ctrl.bps.wms_service import WmsJobReport, WmsRunReport, WmsStates
 
 from ..common.enums import StatusEnum
 from ..common.errors import CMYamlParseError

src/lsst/cmservice/handlers/jobs.py

@@ -8,28 +8,26 @@
 import yaml
 from sqlalchemy.ext.asyncio import async_scoped_session
 
-
 from lsst.cmservice.common.bash import write_bash_script
 from lsst.cmservice.db.element import ElementMixin
 from lsst.cmservice.db.job import Job
 from lsst.cmservice.db.script import Script
 from lsst.cmservice.db.task_set import TaskSet
 from lsst.cmservice.db.wms_task_report import WmsTaskReport
-from lsst.ctrl.bps import BaseWmsService, WmsStates, WmsRunReport
+from lsst.ctrl.bps import BaseWmsService, WmsRunReport, WmsStates
 from lsst.utils import doImport
 
 from ..common.butler import remove_run_collections
 from ..common.enums import LevelEnum, StatusEnum, TaskStatusEnum, WmsMethodEnum
 from ..common.errors import (
     CMBadExecutionMethodError,
+    CMBadParameterTypeError,
     CMIDMismatchError,
     CMMissingScriptInputError,
-    CMBadParameterTypeError,
 )
-from .functions import load_manifest_report, load_wms_reports, status_from_bps_report, compute_job_status
+from .functions import compute_job_status, load_manifest_report, load_wms_reports, status_from_bps_report
 from .script_handler import FunctionHandler, ScriptHandler
 
-
 WMS_TO_TASK_STATUS_MAP = {
     WmsStates.UNKNOWN: TaskStatusEnum.missing,
     WmsStates.MISFIT: TaskStatusEnum.missing,