Run isort

Author: r-owen

bin/command_script_queue

@@ -22,5 +22,4 @@
 
 from lsst.ts.scriptqueue import command_script_queue
 
-
 command_script_queue()

bin/run_one_script

@@ -22,5 +22,4 @@
 
 from lsst.ts.scriptqueue import run_one_script_cli
 
-
 run_one_script_cli()

bin/run_script_queue

@@ -22,5 +22,4 @@
 
 from lsst.ts.scriptqueue import run_script_queue
 
-
 run_script_queue()

doc/conf.py

@@ -3,8 +3,8 @@
 This configuration only affects single-package Sphinx documentation builds.
 """
 
-from documenteer.conf.pipelinespkg import *  # type: ignore # noqa
 import lsst.ts.scriptqueue  # noqa
+from documenteer.conf.pipelinespkg import *  # type: ignore # noqa
 
 project = "ts_scriptqueue"
 html_theme_options["logotext"] = project  # type: ignore # noqa

python/lsst/ts/scriptqueue/__init__.py

@@ -25,8 +25,8 @@
     __version__ = "?"
 
 from .queue_model import *
+from .run_one_script import *
 from .script_info import *
 from .script_queue import *
-from .utils import *
-from .run_one_script import *
 from .script_queue_commander import *
+from .utils import *

python/lsst/ts/scriptqueue/queue_model.py

@@ -31,11 +31,11 @@
 
 import astropy.time
 import psutil
-
 from lsst.ts import salobj
 from lsst.ts.idl.enums.Script import ScriptState
 from lsst.ts.idl.enums.ScriptQueue import Location
 from lsst.ts.utils import index_generator
+
 from . import utils
 from .script_info import ScriptInfo
 

python/lsst/ts/scriptqueue/run_one_script.py

@@ -29,8 +29,8 @@
 import random
 
 import astropy
-
 from lsst.ts import salobj
+
 from .script_queue import SCRIPT_INDEX_MULT, ScriptInfo
 
 STD_TIMEOUT = 5  # timeout for fast commands

python/lsst/ts/scriptqueue/script_info.py

@@ -25,9 +25,9 @@
 import inspect
 import os
 
-from lsst.ts.utils import current_tai
 from lsst.ts.idl.enums.Script import ScriptState
 from lsst.ts.idl.enums.ScriptQueue import ScriptProcessState
+from lsst.ts.utils import current_tai
 
 _CONFIGURE_TIMEOUT = 60  # Time limit for the configure command (seconds)
 _SET_GROUP_ID_TIMEOUT = 5  # Time limit for setGroupId command (seconds)

python/lsst/ts/scriptqueue/script_queue.py

@@ -26,13 +26,12 @@
 import subprocess
 
 import numpy as np
-
 from lsst.ts import salobj
 from lsst.ts.idl.enums.ScriptQueue import SalIndex
-from . import __version__
-from . import utils
-from .script_info import ScriptInfo
+
+from . import __version__, utils
 from .queue_model import QueueModel
+from .script_info import ScriptInfo
 
 SCRIPT_INDEX_MULT = 100000
 """Minimum Script SAL index is ScriptQueue SAL index * SCRIPT_INDEX_MULT

python/lsst/ts/scriptqueue/script_queue_commander.py

@@ -27,8 +27,8 @@
 import string
 
 from lsst.ts import salobj
-from lsst.ts.idl.enums.ScriptQueue import Location, SalIndex
 from lsst.ts.idl.enums.Script import ScriptState
+from lsst.ts.idl.enums.ScriptQueue import Location, SalIndex
 from lsst.ts.utils import make_done_future
 
 ADD_TIMEOUT = 5  # Timeout for the add command (seconds).

python/lsst/ts/scriptqueue/utils.py

@@ -26,8 +26,8 @@
     "get_default_scripts_dir",
 ]
 
-import os
 import logging
+import os
 import time
 
 

setup.py

@@ -1,4 +1,4 @@
-from setuptools import setup
 import setuptools_scm
+from setuptools import setup
 
 setup(version=setuptools_scm.get_version())

tests/data/external/script1

@@ -24,5 +24,4 @@ import asyncio
 
 from lsst.ts.salobj import TestScript
 
-
 asyncio.run(TestScript.amain(descr="external script1"))

tests/data/external/script5

@@ -24,5 +24,4 @@ import asyncio
 
 from lsst.ts.salobj import TestScript
 
-
 asyncio.run(TestScript.amain(descr="external script5"))

tests/data/external/subdir/script3

@@ -24,5 +24,4 @@ import asyncio
 
 from lsst.ts.salobj import TestScript
 
-
 asyncio.run(TestScript.amain(descr="external subdir/script3"))

tests/data/external/subdir/script6

@@ -24,5 +24,4 @@ import asyncio
 
 from lsst.ts.salobj import TestScript
 
-
 asyncio.run(TestScript.amain(descr="external subdir/script6"))

tests/data/standard/script1

@@ -24,5 +24,4 @@ import asyncio
 
 from lsst.ts.salobj import TestScript
 
-
 asyncio.run(TestScript.amain(descr="standard script1"))

tests/data/standard/script2

@@ -24,5 +24,4 @@ import asyncio
 
 from lsst.ts.salobj import TestScript
 
-
 asyncio.run(TestScript.amain(descr="standard script2"))

tests/data/standard/subdir/script3

@@ -24,5 +24,4 @@ import asyncio
 
 from lsst.ts.salobj import TestScript
 
-
 asyncio.run(TestScript.amain(descr="standard subdir/script3"))

tests/test_queue_model.py

@@ -28,11 +28,9 @@
 import warnings
 
 import pytest
-
-from lsst.ts import salobj
-from lsst.ts.idl.enums.ScriptQueue import Location, ScriptProcessState
+from lsst.ts import salobj, scriptqueue
 from lsst.ts.idl.enums.Script import ScriptState
-from lsst.ts import scriptqueue
+from lsst.ts.idl.enums.ScriptQueue import Location, ScriptProcessState
 
 # Long enough to perform any reasonable operation
 # including starting a CSC or loading a script (seconds)
@@ -582,7 +580,6 @@ async def test_get_script_info(self):
         info_dict = dict()
         i0 = None
         for i in range(3):
-
             script_info = self.make_script_info(
                 is_standard=False,
                 path=os.path.join("subdir", "script6"),

tests/test_run_one_script.py

@@ -27,10 +27,8 @@
 
 import pytest
 import yaml
-
+from lsst.ts import salobj, scriptqueue
 from lsst.ts.idl.enums.Script import ScriptState
-from lsst.ts import salobj
-from lsst.ts import scriptqueue
 
 # Long enough to perform any reasonable operation
 # including starting a CSC or loading a script (seconds)

tests/test_script_queue.py

@@ -28,11 +28,9 @@
 
 import pytest
 import yaml
-
-from lsst.ts import salobj
-from lsst.ts.idl.enums.ScriptQueue import Location, SalIndex, ScriptProcessState
+from lsst.ts import salobj, scriptqueue
 from lsst.ts.idl.enums.Script import ScriptState
-from lsst.ts import scriptqueue
+from lsst.ts.idl.enums.ScriptQueue import Location, SalIndex, ScriptProcessState
 
 try:
     from lsst.ts import standardscripts
@@ -692,7 +690,6 @@ async def check_add_log_level(self, log_level):
             )
 
     async def check_bin_script_initial_state(self, cmdline_args):
-
         for initial_state, index in (
             (None, SalIndex.MAIN_TEL),
             (salobj.State.STANDBY, SalIndex.AUX_TEL),
@@ -1566,7 +1563,6 @@ async def test_run_with_standard_and_external(self):
                 "--verbose",
             )
             try:
-
                 summaryState_data = await remote.evt_summaryState.next(
                     flush=False, timeout=STD_TIMEOUT
                 )
@@ -1614,7 +1610,6 @@ async def test_run_default_standard_external(self):
                 exe_name, str(self.index), "--verbose"
             )
             try:
-
                 summaryState_data = await remote.evt_summaryState.next(
                     flush=False, timeout=STD_TIMEOUT
                 )