Add consistency to imports based on isort settings

docs/conf.py

@@ -12,7 +12,6 @@
 
 import sphinx_rtd_theme  # pylint: disable=unused-import
 
-
 # importlib.metadata is implemented in Python 3.8
 # Previous versions require the backport, https://pypi.org/project/importlib-metadata/
 try:

setup.py

@@ -26,7 +26,6 @@
 
 from setuptools import find_packages, setup
 
-
 ####
 # GDS Packages:
 #

src/fprime_gds/common/communication/adapters/ip.py

@@ -7,16 +7,16 @@
 
 @author lestarch
 """
-import atexit
 import abc
+import atexit
 import logging
 import queue
 import socket
 import threading
 import time
 
-import fprime_gds.common.logger
 import fprime_gds.common.communication.adapters.base
+import fprime_gds.common.logger
 
 LOGGER = logging.getLogger("ip_adapter")
 

src/fprime_gds/common/communication/adapters/uart.py

@@ -10,11 +10,10 @@
 
 import logging
 
-import fprime_gds.common.communication.adapters.base
-
 import serial
 from serial.tools import list_ports
 
+import fprime_gds.common.communication.adapters.base
 
 LOGGER = logging.getLogger("serial_adapter")
 

src/fprime_gds/common/communication/framing.py

@@ -12,9 +12,10 @@
 @author lestarch
 """
 import abc
-import sys
 import copy
 import struct
+import sys
+
 from .checksum import calculate_checksum
 
 

src/fprime_gds/common/communication/ground.py

@@ -11,9 +11,10 @@
 import abc
 import logging
 
-from .framing import TcpServerFramerDeframer
 from fprime_gds.common.communication.adapters.ip import TcpHandler
 
+from .framing import TcpServerFramerDeframer
+
 LOGGER = logging.getLogger("gds_sender")
 
 

src/fprime_gds/common/communication/updown.py

@@ -9,16 +9,16 @@
 is represented by a single thread, as it is not dealing with multiple streams of data that need to be multiplexed.
 
 """
-import threading
-from queue import Queue, Full, Empty
 import logging
+import threading
+from queue import Empty, Full, Queue
 
 from fprime.common.models.serialize.numerical_types import U32Type
-from fprime_gds.common.utils.data_desc_type import DataDescType
+
 from fprime_gds.common.communication.adapters.base import BaseAdapter
-from fprime_gds.common.communication.ground import GroundHandler
 from fprime_gds.common.communication.framing import FramerDeframer
-
+from fprime_gds.common.communication.ground import GroundHandler
+from fprime_gds.common.utils.data_desc_type import DataDescType
 
 DW_LOGGER = logging.getLogger("downlink")
 UP_LOGGER = logging.getLogger("uplink")

src/fprime_gds/common/data_types/ch_data.py

@@ -8,10 +8,11 @@
 """
 
 from fprime.common.models.serialize import time_type
+from fprime.common.models.serialize.array_type import ArrayType
+from fprime.common.models.serialize.serializable_type import SerializableType
+
 from fprime_gds.common.data_types import sys_data
 from fprime_gds.common.utils.string_util import format_string_template
-from fprime.common.models.serialize.serializable_type import SerializableType
-from fprime.common.models.serialize.array_type import ArrayType
 
 
 class ChData(sys_data.SysData):

src/fprime_gds/common/data_types/cmd_data.py

@@ -10,10 +10,13 @@
 @bug No known bugs
 """
 import json
+
 from fprime.common.models.serialize.array_type import ArrayType
 from fprime.common.models.serialize.bool_type import BoolType
 from fprime.common.models.serialize.enum_type import EnumType
 from fprime.common.models.serialize.numerical_types import (
+    F32Type,
+    F64Type,
     I8Type,
     I16Type,
     I32Type,
@@ -22,12 +25,11 @@
     U16Type,
     U32Type,
     U64Type,
-    F32Type,
-    F64Type,
 )
 from fprime.common.models.serialize.serializable_type import SerializableType
 from fprime.common.models.serialize.string_type import StringType
 from fprime.common.models.serialize.time_type import TimeBase, TimeType
+
 from fprime_gds.common.data_types import sys_data
 
 

src/fprime_gds/common/data_types/event_data.py

@@ -8,6 +8,7 @@
 """
 
 from fprime.common.models.serialize import time_type
+
 from fprime_gds.common.data_types import sys_data
 from fprime_gds.common.utils.string_util import format_string_template
 

src/fprime_gds/common/data_types/sys_data.py

@@ -11,6 +11,7 @@
 @bug No known bugs
 """
 from fprime.common.models.serialize import time_type
+
 from fprime_gds.common.templates import data_template
 
 

src/fprime_gds/common/decoders/ch_decoder.py

@@ -17,6 +17,7 @@
 @bug No known bugs
 """
 from fprime.common.models.serialize.time_type import TimeType
+
 from fprime_gds.common.data_types.ch_data import ChData
 from fprime_gds.common.decoders.decoder import Decoder, DecodingException
 from fprime_gds.common.utils import config_manager

src/fprime_gds/common/decoders/event_decoder.py

@@ -16,6 +16,7 @@
 """
 from fprime.common.models.serialize import time_type
 from fprime.common.models.serialize.type_exceptions import TypeException
+
 from fprime_gds.common.data_types import event_data
 from fprime_gds.common.decoders import decoder
 from fprime_gds.common.utils import config_manager

src/fprime_gds/common/decoders/pkt_decoder.py

@@ -18,6 +18,7 @@
 """
 
 from fprime.common.models.serialize.time_type import TimeType
+
 from fprime_gds.common.data_types.ch_data import ChData
 from fprime_gds.common.decoders.ch_decoder import ChDecoder
 from fprime_gds.common.utils import config_manager

src/fprime_gds/common/distributor/distributor.py

@@ -14,10 +14,10 @@
 @bug No known bugs
 """
 import logging
-from fprime_gds.common.utils import config_manager, data_desc_type
-from fprime_gds.common.handlers import DataHandler
-from fprime_gds.common.decoders.decoder import DecodingException
 
+from fprime_gds.common.decoders.decoder import DecodingException
+from fprime_gds.common.handlers import DataHandler
+from fprime_gds.common.utils import config_manager, data_desc_type
 
 LOGGER = logging.getLogger("distributor")
 

src/fprime_gds/common/encoders/ch_encoder.py

@@ -32,10 +32,11 @@
 @bug No known bugs
 """
 
-from .encoder import Encoder
 from fprime_gds.common.data_types.ch_data import ChData
 from fprime_gds.common.utils.data_desc_type import DataDescType
 
+from .encoder import Encoder
+
 
 class ChEncoder(Encoder):
     """Encoder class for channel data"""

src/fprime_gds/common/encoders/cmd_encoder.py

@@ -42,11 +42,13 @@
 """
 
 
-from . import encoder
 from fprime.common.models.serialize.numerical_types import U32Type
+
 from fprime_gds.common.data_types.cmd_data import CmdData
-from fprime_gds.common.utils.data_desc_type import DataDescType
 from fprime_gds.common.utils import config_manager
+from fprime_gds.common.utils.data_desc_type import DataDescType
+
+from . import encoder
 
 
 class CmdEncoder(encoder.Encoder):

src/fprime_gds/common/encoders/event_encoder.py

@@ -37,10 +37,11 @@
 @bug No known bugs
 """
 
-from .encoder import Encoder
 from fprime_gds.common.data_types.event_data import EventData
 from fprime_gds.common.utils.data_desc_type import DataDescType
 
+from .encoder import Encoder
+
 
 class EventEncoder(Encoder):
     """Encoder class for event data"""

src/fprime_gds/common/encoders/file_encoder.py

@@ -45,6 +45,7 @@
 
 from fprime.common.models.serialize.numerical_types import U32Type
 from fprime.constants import DATA_ENCODING
+
 from fprime_gds.common.data_types.file_data import FilePacketType
 from fprime_gds.common.utils.data_desc_type import DataDescType
 

src/fprime_gds/common/encoders/pkt_encoder.py

@@ -37,10 +37,11 @@
 @bug No known bugs
 """
 
-from .encoder import Encoder
 from fprime_gds.common.data_types.pkt_data import PktData
 from fprime_gds.common.utils.data_desc_type import DataDescType
 
+from .encoder import Encoder
+
 
 class PktEncoder(Encoder):
     """Encoder class for packet data"""

src/fprime_gds/common/encoders/seq_writer.py

@@ -7,8 +7,9 @@
 import struct
 import zlib
 
-from fprime.common.models.serialize.type_exceptions import TypeMismatchException
 from fprime.common.models.serialize.numerical_types import U8Type, U16Type, U32Type
+from fprime.common.models.serialize.type_exceptions import TypeMismatchException
+
 from fprime_gds.common.utils import config_manager
 from fprime_gds.common.utils.data_desc_type import DataDescType
 

src/fprime_gds/common/files/downlinker.py

@@ -14,6 +14,7 @@
 import os
 
 import fprime.constants
+
 import fprime_gds.common.handlers
 from fprime_gds.common.data_types.file_data import FilePacketType
 from fprime_gds.common.files.helpers import (

src/fprime_gds/common/gds_cli/base_commands.py

@@ -4,8 +4,8 @@
 """
 
 import abc
-import sys
 import json
+import sys
 from typing import Iterable
 
 import fprime_gds.common.gds_cli.filtering_utils as filtering_utils

src/fprime_gds/common/gds_cli/command_send.py

@@ -5,8 +5,9 @@
 import difflib
 from typing import Iterable, List
 
-import fprime_gds.common.gds_cli.test_api_utils as test_api_utils
 from fprime.common.models.serialize.type_exceptions import NotInitializedException
+
+import fprime_gds.common.gds_cli.test_api_utils as test_api_utils
 from fprime_gds.common.gds_cli.base_commands import BaseCommand
 from fprime_gds.common.pipeline.dictionaries import Dictionaries
 from fprime_gds.common.templates.cmd_template import CmdTemplate

src/fprime_gds/common/gds_cli/test_api_utils.py

@@ -3,15 +3,14 @@
 """
 
 import types
-from typing import Any, Dict, List
+from typing import Any, Callable, Dict, List
 
 from fprime_gds.common.data_types.ch_data import ChData
 from fprime_gds.common.data_types.event_data import EventData
 from fprime_gds.common.data_types.sys_data import SysData
 from fprime_gds.common.templates.data_template import DataTemplate
 from fprime_gds.common.testing_fw import predicates
 from fprime_gds.common.testing_fw.api import IntegrationTestAPI
-from typing import Callable
 
 
 def get_upcoming_event(

src/fprime_gds/common/history/chrono.py

@@ -7,6 +7,7 @@
 :author: koran
 """
 from fprime.common.models.serialize.time_type import TimeType
+
 from fprime_gds.common.history.history import History
 from fprime_gds.common.testing_fw import predicates
 

src/fprime_gds/common/history/ram.py

@@ -9,8 +9,8 @@
 
 :author: lestarch
 """
-import time
 import threading
+import time
 
 from fprime_gds.common.history.history import History
 

src/fprime_gds/common/loaders/event_py_loader.py

@@ -8,6 +8,7 @@
 """
 
 from fprime.common.models.serialize.type_exceptions import TypeMismatchException
+
 from fprime_gds.common.templates import event_template
 from fprime_gds.common.utils.event_severity import EventSeverity
 

src/fprime_gds/common/loaders/xml_loader.py

@@ -14,12 +14,13 @@
 @bug No known bugs
 """
 import os
-from lxml import etree
 
 from fprime.common.models.serialize.array_type import ArrayType
 from fprime.common.models.serialize.bool_type import BoolType
 from fprime.common.models.serialize.enum_type import EnumType
 from fprime.common.models.serialize.numerical_types import (
+    F32Type,
+    F64Type,
     I8Type,
     I16Type,
     I32Type,
@@ -28,15 +29,15 @@
     U16Type,
     U32Type,
     U64Type,
-    F32Type,
-    F64Type,
 )
 from fprime.common.models.serialize.serializable_type import SerializableType
 from fprime.common.models.serialize.string_type import StringType
+from lxml import etree
+
 from fprime_gds.common.data_types import exceptions
 from fprime_gds.version import (
-    MINIMUM_SUPPORTED_FRAMEWORK_VERSION,
     MAXIMUM_SUPPORTED_FRAMEWORK_VERSION,
+    MINIMUM_SUPPORTED_FRAMEWORK_VERSION,
 )
 
 # Custom Python Modules

src/fprime_gds/common/logger/test_logger.py

@@ -22,8 +22,8 @@
 # If openpyxl isn't installed, ignore all functionality in this module
 try:
     from openpyxl import Workbook
-    from openpyxl.styles import PatternFill, Font, Alignment
     from openpyxl.cell import WriteOnlyCell
+    from openpyxl.styles import Alignment, Font, PatternFill
     from openpyxl.utils.exceptions import WorkbookAlreadySaved
 
     MODULE_INSTALLED = True

src/fprime_gds/common/models/common/command.py

@@ -7,6 +7,7 @@
 import copy
 from enum import Enum
 
+from fprime.common.models.serialize.numerical_types import U32Type
 from fprime.common.models.serialize.type_base import BaseType
 
 # Import the types this way so they do not need prefixing for execution.
@@ -15,7 +16,6 @@
     ArgNotFoundException,
     TypeMismatchException,
 )
-from fprime.common.models.serialize.numerical_types import U32Type
 
 Descriptor = Enum(value="Descriptor", names="ABSOLUTE RELATIVE")