Merge pull request #85 from SpiNNakerManchester/minor-import-improvem…

…ents

Make import statements use PEP 328 better

gfe_integration_tests/test_rte/test_rte_during_run.py

@@ -1,11 +1,10 @@
 import os
+import traceback
 import pytest
-
-import spinnaker_graph_front_end as s
 from spinn_front_end_common.utilities.utility_objs import ExecutableType
-from gfe_integration_tests.test_rte.test_run_vertex import TestRunVertex
 from spinnman.exceptions import SpinnmanException
-import traceback
+import spinnaker_graph_front_end as s
+from gfe_integration_tests.test_rte.test_run_vertex import TestRunVertex
 
 
 def test_rte_during_run():

gfe_integration_tests/test_rte/test_rte_during_run_forever.py

@@ -1,12 +1,11 @@
 import os
 from time import sleep
 import pytest
-
-import spinnaker_graph_front_end as s
 from spinn_front_end_common.utilities.utility_objs import ExecutableType
+from spinn_front_end_common.utilities.exceptions import (
+    ExecutableFailedToStopException)
+import spinnaker_graph_front_end as s
 from gfe_integration_tests.test_rte.test_run_vertex import TestRunVertex
-from spinn_front_end_common.utilities.exceptions \
-    import ExecutableFailedToStopException
 
 
 def test_rte_during_run_forever():

gfe_integration_tests/test_rte/test_rte_start.py

@@ -1,10 +1,9 @@
 import os
 import pytest
-
-import spinnaker_graph_front_end as s
 from spinn_front_end_common.utilities.utility_objs import ExecutableType
-from gfe_integration_tests.test_rte.test_run_vertex import TestRunVertex
 from spinnman.exceptions import SpinnmanException
+import spinnaker_graph_front_end as s
+from gfe_integration_tests.test_rte.test_run_vertex import TestRunVertex
 
 
 def test_rte_at_start():

gfe_integration_tests/test_rte/test_run_too_long.py

@@ -1,10 +1,9 @@
 import os
 import pytest
-
-import spinnaker_graph_front_end as s
 from spinn_front_end_common.utilities.utility_objs import ExecutableType
-from gfe_integration_tests.test_rte.test_run_vertex import TestRunVertex
 from spinnman.exceptions import SpinnmanTimeoutException
+import spinnaker_graph_front_end as s
+from gfe_integration_tests.test_rte.test_run_vertex import TestRunVertex
 
 
 def test_run_too_long():

gfe_integration_tests/test_rte/test_run_vertex.py

@@ -1,11 +1,12 @@
 from pacman.model.graphs.machine import SimpleMachineVertex
 from pacman.model.resources import ResourceContainer
-from spinn_front_end_common.abstract_models \
-    import AbstractHasAssociatedBinary, AbstractGeneratesDataSpecification
-from spinn_front_end_common.interface.simulation \
-    import simulation_utilities as utils
-from spinn_front_end_common.utilities.constants \
-    import SYSTEM_BYTES_REQUIREMENT
+from spinn_front_end_common.abstract_models import (
+    AbstractHasAssociatedBinary, AbstractGeneratesDataSpecification)
+from spinn_front_end_common.interface.simulation import (
+    simulation_utilities as
+    utils)
+from spinn_front_end_common.utilities.constants import (
+    SYSTEM_BYTES_REQUIREMENT)
 
 
 class TestRunVertex(

spinnaker_graph_front_end/__init__.py

@@ -1,23 +1,16 @@
-# graph front end imports
-from spinnaker_graph_front_end._version import \
-    __version__, __version_name__, __version_month__, __version_year__
-from spinnaker_graph_front_end.spinnaker import SpiNNaker
-from spinnaker_graph_front_end import spinnaker as gfe_file
-
-from spinn_utilities.socket_address import SocketAddress
-
-# front end common imports
-from spinn_front_end_common.utilities.utility_objs import ExecutableFinder
-from spinn_front_end_common.utilities import globals_variables
-# utility models for graph front ends
-from spinn_front_end_common.utility_models import LivePacketGather
-from spinn_front_end_common.utility_models import ReverseIpTagMultiCastSource
-
-from pacman.model.graphs.machine import MachineEdge
-
 import os
 import logging
 import sys
+from spinn_utilities.socket_address import SocketAddress
+from pacman.model.graphs.machine import MachineEdge
+from spinn_front_end_common.utilities.utility_objs import ExecutableFinder
+from spinn_front_end_common.utilities import globals_variables
+from spinn_front_end_common.utility_models import (
+    LivePacketGather, ReverseIpTagMultiCastSource)
+from spinnaker_graph_front_end._version import (
+    __version__, __version_name__, __version_month__, __version_year__)
+from spinnaker_graph_front_end.spinnaker import SpiNNaker
+from spinnaker_graph_front_end import spinnaker as gfe_file
 
 logger = logging.getLogger(__name__)
 

spinnaker_graph_front_end/examples/Conways/no_edges_examples/conways_no_edges.py

@@ -1,7 +1,7 @@
 import spinnaker_graph_front_end as front_end
-
 from spinnaker_graph_front_end.examples.Conways.no_edges_examples.\
-    conways_basic_cell import ConwayBasicCell
+    conways_basic_cell import (
+        ConwayBasicCell)
 
 
 # set up the front end and ask for the detected machines dimensions

spinnaker_graph_front_end/examples/Conways/partitioned_example_a_no_vis_no_buffer/conways_basic_cell.py

@@ -1,28 +1,21 @@
-# pacman imports
+import struct
+from enum import Enum
 from spinn_utilities.overrides import overrides
-
-from pacman.executor.injection_decorator \
-    import supports_injection, inject_items
+from pacman.executor.injection_decorator import (
+    supports_injection, inject_items)
 from pacman.model.graphs.machine import MachineVertex
-from pacman.model.resources import ResourceContainer, CPUCyclesPerTickResource
-from pacman.model.resources import DTCMResource, SDRAMResource
+from pacman.model.resources import (
+    ResourceContainer, CPUCyclesPerTickResource, DTCMResource, SDRAMResource)
 from pacman.utilities.utility_calls import is_single
-
-# spinn front end common imports
 from spinn_front_end_common.utilities.constants import SYSTEM_BYTES_REQUIREMENT
 from spinn_front_end_common.utilities.exceptions import ConfigurationException
-from spinn_front_end_common.utilities.helpful_functions \
-    import locate_memory_region_for_placement
-from spinn_front_end_common.abstract_models.impl \
-    import MachineDataSpecableVertex
-
+from spinn_front_end_common.abstract_models.impl import (
+    MachineDataSpecableVertex)
+from spinn_front_end_common.utilities.helpful_functions import (
+    locate_memory_region_for_placement)
 from spinnaker_graph_front_end.utilities import SimulatorVertex
-from spinnaker_graph_front_end.utilities.data_utils \
-    import generate_system_data_region
-
-# general imports
-from enum import Enum
-import struct
+from spinnaker_graph_front_end.utilities.data_utils import (
+    generate_system_data_region)
 
 
 @supports_injection

spinnaker_graph_front_end/examples/Conways/partitioned_example_a_no_vis_no_buffer/conways_partitioned.py

@@ -1,11 +1,9 @@
+import os
 from pacman.model.graphs.machine import MachineEdge
 import spinnaker_graph_front_end as front_end
-
 from spinnaker_graph_front_end.examples.Conways.\
-    partitioned_example_a_no_vis_no_buffer.conways_basic_cell \
-    import ConwayBasicCell
-
-import os
+    partitioned_example_a_no_vis_no_buffer.conways_basic_cell import (
+        ConwayBasicCell)
 
 runtime = 50
 # machine_time_step = 100

spinnaker_graph_front_end/examples/Conways/partitioned_example_b_no_vis_buffer/conways_basic_cell.py

@@ -1,31 +1,25 @@
+import struct
+from enum import Enum
 from spinn_utilities.overrides import overrides
-# pacman imports
 from pacman.model.graphs.machine import MachineVertex
-from pacman.model.resources import ResourceContainer, CPUCyclesPerTickResource
-from pacman.model.resources import DTCMResource, SDRAMResource
+from pacman.model.resources import (
+    ResourceContainer, CPUCyclesPerTickResource, DTCMResource, SDRAMResource)
 from pacman.utilities.utility_calls import is_single
-
-# spinn front end common imports
-from spinn_front_end_common.utilities.constants \
-    import SYSTEM_BYTES_REQUIREMENT, MAX_SIZE_OF_BUFFERED_REGION_ON_CHIP
-from spinn_front_end_common.utilities.exceptions import ConfigurationException
-from spinn_front_end_common.utilities.helpful_functions \
-    import locate_memory_region_for_placement, read_config_int
 from spinn_front_end_common.utilities import globals_variables
-from spinn_front_end_common.interface.buffer_management.buffer_models\
-    import AbstractReceiveBuffersToHost
-from spinn_front_end_common.interface.buffer_management \
-    import recording_utilities
-from spinn_front_end_common.abstract_models.impl \
-    import MachineDataSpecableVertex
-
+from spinn_front_end_common.interface.buffer_management.buffer_models import (
+    AbstractReceiveBuffersToHost)
+from spinn_front_end_common.interface.buffer_management import (
+    recording_utilities)
+from spinn_front_end_common.abstract_models.impl import (
+    MachineDataSpecableVertex)
+from spinn_front_end_common.utilities.constants import (
+    SYSTEM_BYTES_REQUIREMENT, MAX_SIZE_OF_BUFFERED_REGION_ON_CHIP)
+from spinn_front_end_common.utilities.exceptions import ConfigurationException
+from spinn_front_end_common.utilities.helpful_functions import (
+    locate_memory_region_for_placement, read_config_int)
 from spinnaker_graph_front_end.utilities import SimulatorVertex
-from spinnaker_graph_front_end.utilities.data_utils \
-    import generate_system_data_region
-
-# general imports
-from enum import Enum
-import struct
+from spinnaker_graph_front_end.utilities.data_utils import (
+    generate_system_data_region)
 
 
 class ConwayBasicCell(

spinnaker_graph_front_end/examples/Conways/partitioned_example_b_no_vis_buffer/conways_partitioned.py

@@ -1,11 +1,9 @@
+import os
 from pacman.model.graphs.machine import MachineEdge
 import spinnaker_graph_front_end as front_end
-
 from spinnaker_graph_front_end.examples.Conways.\
-    partitioned_example_b_no_vis_buffer.conways_basic_cell \
-    import ConwayBasicCell
-
-import os
+    partitioned_example_b_no_vis_buffer.conways_basic_cell import (
+        ConwayBasicCell)
 
 runtime = 50
 # machine_time_step = 100

spinnaker_graph_front_end/examples/hello_world/hello_world.py

@@ -7,14 +7,11 @@
 We then fetch the written data and print it on the python console.
 """
 
-import spinnaker_graph_front_end as front_end
-
-from spinnaker_graph_front_end.examples.hello_world.hello_world_vertex\
-    import HelloWorldVertex
-
 import logging
 import os
-
+import spinnaker_graph_front_end as front_end
+from spinnaker_graph_front_end.examples.hello_world.hello_world_vertex import (
+    HelloWorldVertex)
 
 logger = logging.getLogger(__name__)
 

spinnaker_graph_front_end/examples/hello_world/hello_world_vertex.py

@@ -1,24 +1,21 @@
+import logging
+from enum import Enum
 from spinn_utilities.overrides import overrides
 from pacman.model.graphs.machine import MachineVertex
-from pacman.model.resources import CPUCyclesPerTickResource, DTCMResource
-from pacman.model.resources import ResourceContainer, SDRAMResource
-
+from pacman.model.resources import (
+    CPUCyclesPerTickResource, DTCMResource, ResourceContainer, SDRAMResource)
 from spinn_front_end_common.utilities import globals_variables
-from spinn_front_end_common.utilities.helpful_functions \
-    import locate_memory_region_for_placement, read_config_int
-from spinn_front_end_common.abstract_models.impl \
-    import MachineDataSpecableVertex
-from spinn_front_end_common.interface.buffer_management.buffer_models\
-    import AbstractReceiveBuffersToHost
-from spinn_front_end_common.interface.buffer_management\
-    import recording_utilities
-
+from spinn_front_end_common.abstract_models.impl import (
+    MachineDataSpecableVertex)
+from spinn_front_end_common.interface.buffer_management.buffer_models import (
+    AbstractReceiveBuffersToHost)
+from spinn_front_end_common.interface.buffer_management import (
+    recording_utilities)
+from spinn_front_end_common.utilities.helpful_functions import (
+    locate_memory_region_for_placement, read_config_int)
 from spinnaker_graph_front_end.utilities import SimulatorVertex
-from spinnaker_graph_front_end.utilities.data_utils \
-    import generate_system_data_region
-
-from enum import Enum
-import logging
+from spinnaker_graph_front_end.utilities.data_utils import (
+    generate_system_data_region)
 
 logger = logging.getLogger(__name__)
 

spinnaker_graph_front_end/examples/speed_test_solo/main_solo.py

@@ -1,13 +1,11 @@
 import struct
 import traceback
-
-import spinnaker_graph_front_end as sim
 import time
+import spinnaker_graph_front_end as sim
 from spinnaker_graph_front_end.examples import speed_test_solo
-
-# data to write
 from spinnaker_graph_front_end.examples.speed_test_solo.\
-    packet_gatherer_cheat import PacketGathererCheat
+    packet_gatherer_cheat import (
+        PacketGathererCheat)
 
 mbs = 1.0
 

spinnaker_graph_front_end/examples/speed_test_solo/packet_gatherer_cheat.py

@@ -1,23 +1,20 @@
 import struct
-
+import math
+import time
 from enum import Enum
-
 from pacman.model.graphs.machine import MachineVertex
-from pacman.model.resources import ResourceContainer, SDRAMResource, \
-    IPtagResource
+from pacman.model.resources import (
+    ResourceContainer, SDRAMResource, IPtagResource)
 from spinn_front_end_common.abstract_models import AbstractHasAssociatedBinary
-from spinn_front_end_common.abstract_models.impl import \
-    MachineDataSpecableVertex
+from spinn_front_end_common.abstract_models.impl import (
+    MachineDataSpecableVertex)
 from spinn_front_end_common.utilities.utility_objs import ExecutableType
 from spinn_front_end_common.utilities import constants
 from spinn_front_end_common.interface.simulation import simulation_utilities
 from spinnman.connections.udp_packet_connections import UDPConnection
 from spinnman.exceptions import SpinnmanTimeoutException
 from spinnman.messages.sdp import SDPMessage, SDPHeader, SDPFlag
 
-import math
-import time
-
 
 class PacketGathererCheat(
         MachineVertex, MachineDataSpecableVertex, AbstractHasAssociatedBinary):

spinnaker_graph_front_end/examples/speed_tracker/main.py

@@ -1,15 +1,14 @@
 import struct
 import traceback
-
-import spinnaker_graph_front_end as sim
+import time
 from pacman.model.constraints.placer_constraints import ChipAndCoreConstraint
 from pacman.model.graphs.machine import MachineEdge
-from spinnaker_graph_front_end.examples.speed_tracker.packt_gatherer import \
-    PacketGatherer
+import spinnaker_graph_front_end as sim
+from spinnaker_graph_front_end.examples.speed_tracker.packt_gatherer import (
+    PacketGatherer)
 from spinnaker_graph_front_end.examples.speed_tracker.\
-    sdram_reader_and_transmitter import \
-    SDRAMReaderAndTransmitter
-import time
+    sdram_reader_and_transmitter import (
+        SDRAMReaderAndTransmitter)
 from spinnaker_graph_front_end.examples import speed_tracker
 
 # data to write
@@ -72,8 +71,6 @@
             start_value = value + 1
         else:
             start_value += 1
-
-
 except Exception:
     # if boomed. end so that we can get iobuf
     traceback.print_exc()

spinnaker_graph_front_end/examples/speed_tracker/packt_gatherer.py

@@ -1,18 +1,16 @@
 import struct
-
 from enum import Enum
-
 from pacman.model.graphs.machine import MachineVertex
-from pacman.model.resources import ResourceContainer, SDRAMResource, \
-    IPtagResource
+from pacman.model.resources import (
+    ResourceContainer, SDRAMResource, IPtagResource)
+from spinnman.connections.udp_packet_connections import UDPConnection
+from spinnman.messages.sdp import SDPMessage, SDPHeader, SDPFlag
 from spinn_front_end_common.abstract_models import AbstractHasAssociatedBinary
-from spinn_front_end_common.abstract_models.impl import \
-    MachineDataSpecableVertex
+from spinn_front_end_common.abstract_models.impl import (
+    MachineDataSpecableVertex)
 from spinn_front_end_common.utilities.utility_objs import ExecutableType
 from spinn_front_end_common.utilities import constants
 from spinn_front_end_common.interface.simulation import simulation_utilities
-from spinnman.connections.udp_packet_connections import UDPConnection
-from spinnman.messages.sdp import SDPMessage, SDPHeader, SDPFlag
 
 
 class PacketGatherer(