chore: Restore ruff rules

ampel/cli/JobCommand.py

@@ -8,16 +8,28 @@
 # Last Modified By:    valery brinnel <firstname.lastname@gmail.com>
 
 
-import importlib, importlib.metadata
-import sys, io, os, platform, filecmp, shutil, signal
-import subprocess, tempfile, traceback, ujson, yaml, psutil
-
-from typing import Any
+import filecmp
+import importlib
+import importlib.metadata
+import io
+import os
+import platform
+import shutil
+import signal
+import subprocess
+import sys
+import tempfile
+import traceback
+from argparse import ArgumentParser
 from collections.abc import Sequence
-from multiprocessing import Queue, Process
 from contextlib import suppress
-from argparse import ArgumentParser
-from time import time, sleep
+from multiprocessing import Process, Queue
+from time import sleep, time
+from typing import Any
+
+import psutil
+import ujson
+import yaml
 
 from ampel.abstract.AbsEventUnit import AbsEventUnit
 from ampel.cli.AbsCoreCommand import AbsCoreCommand
@@ -31,11 +43,9 @@
 from ampel.dev.DevAmpelContext import DevAmpelContext
 from ampel.log.AmpelLogger import AmpelLogger
 from ampel.log.LogFlag import LogFlag
-
 from ampel.model.job.JobModel import JobModel
 from ampel.model.job.JobTaskModel import JobTaskModel
 from ampel.model.UnitModel import UnitModel
-
 from ampel.util.collections import try_reduce
 from ampel.util.debug import MockPool, report_stats, start_profiling
 from ampel.util.distrib import get_dist_names

ampel/core/DocBuilder.py

@@ -8,8 +8,8 @@
 # Last Modified By:    valery brinnel <firstname.lastname@gmail.com>
 
 from datetime import datetime, timezone
-from typing import Literal, TypeVar
 from importlib import import_module
+from typing import Literal, TypeVar
 
 from ampel.abstract.AbsUnitResultAdapter import AbsUnitResultAdapter
 from ampel.base.AmpelUnit import AmpelUnit

ampel/core/EventHandler.py

@@ -13,10 +13,10 @@
 from bson import ObjectId
 
 from ampel.enum.EventCode import EventCode
-from ampel.protocol.LoggerProtocol import LoggerProtocol
 from ampel.log.AmpelLogger import AmpelLogger
 from ampel.log.AmpelLoggingError import AmpelLoggingError
 from ampel.log.utils import report_exception
+from ampel.protocol.LoggerProtocol import LoggerProtocol
 from ampel.struct.Resource import Resource
 
 if TYPE_CHECKING:

ampel/mongo/model/ShortIndexModel.py

@@ -7,7 +7,7 @@
 # Last Modified Date:  30.10.2025
 # Last Modified By:    valery brinnel <firstname.lastname@gmail.com>
 
-from typing import Any, Dict # noqa: UP035
+from typing import Any, Dict  # noqa: UP035
 
 from ampel.base.AmpelBaseModel import AmpelBaseModel
 from ampel.mongo.model.FieldModel import FieldModel

ampel/t3/stage/T3AggregatingStager.py

@@ -7,22 +7,21 @@
 # Last Modified Date:  08.06.2023
 # Last Modified By:    valery brinnel <firstname.lastname@gmail.com>
 
+from collections.abc import Generator, Sequence
 from time import time
 from typing import Any
-from collections.abc import Generator, Sequence
 
 from ampel.base.AmpelBaseModel import AmpelBaseModel
-from ampel.types import OneOrMany, UBson
-from ampel.t3.stage.T3SequentialStager import T3SequentialStager
-from ampel.struct.T3Store import T3Store
-from ampel.struct.AmpelBuffer import AmpelBuffer
-from ampel.view.T3DocView import T3DocView
-from ampel.content.T3Document import T3Document
+from ampel.cli.utils import _maybe_int
 from ampel.content.MetaRecord import MetaRecord
-
-from ampel.util.mappings import get_by_json_path
+from ampel.content.T3Document import T3Document
+from ampel.struct.AmpelBuffer import AmpelBuffer
+from ampel.struct.T3Store import T3Store
+from ampel.t3.stage.T3SequentialStager import T3SequentialStager
+from ampel.types import OneOrMany, UBson
 from ampel.util.debug import report_stats, start_profiling
-from ampel.cli.utils import _maybe_int
+from ampel.util.mappings import get_by_json_path
+from ampel.view.T3DocView import T3DocView
 
 
 class TargetModel(AmpelBaseModel):
@@ -197,7 +196,7 @@ def stage(self,
 			if self.profiling:
 				report_stats(cprofile, self.profiling, f'.{t3_unit.__class__.__name__}.{i+1}')
 
-			if t3_ret:
+			if t3_ret:  # noqa: SIM102
 				if (x := self.handle_t3_result(t3_unit, t3_ret, t3s, None, ts)):
 					if self.propagate:
 						t3s.add_view(T3DocView.of(x, self.context.config))

ampel/util/debug.py

@@ -8,17 +8,16 @@
 # Last Modified By:    valery brinnel <firstname.lastname@gmail.com>
 
 
+import multiprocessing.pool
 import os
-import sys
 import pdb
+import sys
 import traceback
-import multiprocessing.pool
 from cProfile import Profile
 from pstats import Stats
 
 from ampel.cli.utils import _maybe_int
 
-
 """
 Usage:
 from ampel.util.debug import mp_breakpoint

ampel/util/distrib.py

@@ -7,11 +7,14 @@
 # Last Modified Date:  23.04.2022
 # Last Modified By:    valery brinnel <firstname.lastname@gmail.com>
 
-import os, re, importlib, json
-from typing import TypeAlias
+import importlib
+import json
+import os
+import re
 from collections.abc import Generator, MutableSequence, Sequence
 from importlib import metadata
 from pathlib import Path
+from typing import TypeAlias
 
 # NB: PackagePath implements read_text(), but is not a subclass of Path
 PathLike: TypeAlias = Path | metadata.PackagePath

pyproject.toml

@@ -144,9 +144,6 @@ select = [
     "RUF",
 ]
 ignore = [
-	"E401", # Multiple imports on one line
-	"I001", # Import block is un-sorted or un-formatted
-	"SIM102", # Use a single `if` statement instead of nested `if` statements
     "E741", # ambiguous variable name
     "UP009", # UTF-8 encoding declaration is unnecessary
     "PLR09", # too many (arguments|branches)