find and fix imports from inits

spalloc_client/__init__.py

@@ -14,16 +14,16 @@
 
 from spalloc_client._version import __version__  # noqa: F401
 
+from .job import Job, JobDestroyedError, StateChangeTimeoutError
+
 # Alias useful objects
-from spalloc_client.protocol_client import (
+from .protocol_client import (
     ProtocolClient,
     ProtocolError,
     ProtocolTimeoutError,
     SpallocServerException,
 )
-from spalloc_client.states import JobState
-
-from .job import Job, JobDestroyedError, StateChangeTimeoutError
+from .states import JobState
 
 __all__ = [
     "Job", "JobDestroyedError", "JobState", "ProtocolClient",

spalloc_client/scripts/alloc.py

@@ -117,15 +117,15 @@
 
 from spinn_utilities.log import FormatAdapter
 
-from spalloc_client import (
-    Job,
-    JobState,
+from spalloc_client._version import __version__
+from spalloc_client.job import Job
+from spalloc_client.protocol_client import (
     ProtocolError,
     ProtocolTimeoutError,
     SpallocServerException,
-    __version__,
 )
 from spalloc_client.spalloc_config import SpallocConfig
+from spalloc_client.states import JobState
 from spalloc_client.term import Terminal, render_definitions
 
 # pylint: disable=invalid-name

spalloc_client/scripts/job.py

@@ -81,10 +81,12 @@
 from spinn_utilities.overrides import overrides
 from spinn_utilities.typing.json import JsonObject
 
-from spalloc_client import JobState, ProtocolClient, __version__
 from spalloc_client._utils import render_timestamp
+from spalloc_client._version import __version__
+from spalloc_client.protocol_client import ProtocolClient
 from spalloc_client.scripts.support import Script, Terminate
 from spalloc_client.spalloc_config import SpallocConfig
+from spalloc_client.states import JobState
 from spalloc_client.term import (
     DEFAULT_BOARD_EDGES,
     Terminal,

spalloc_client/scripts/machine.py

@@ -38,7 +38,8 @@
 from spinn_utilities.overrides import overrides
 from spinn_utilities.typing.json import JsonObject, JsonObjectArray
 
-from spalloc_client import ProtocolClient, __version__
+from spalloc_client._version import __version__
+from spalloc_client.protocol_client import ProtocolClient
 from spalloc_client.scripts.support import Script, Terminate
 from spalloc_client.spalloc_config import SpallocConfig
 from spalloc_client.term import (

spalloc_client/scripts/ps.py

@@ -32,8 +32,10 @@
 from spinn_utilities.overrides import overrides
 from spinn_utilities.typing.json import JsonObjectArray
 
-from spalloc_client import JobState, ProtocolClient, __version__
 from spalloc_client._utils import render_timestamp
+from spalloc_client._version import __version__
+from spalloc_client.job import JobState
+from spalloc_client.protocol_client import ProtocolClient
 from spalloc_client.spalloc_config import SpallocConfig
 from spalloc_client.term import TableColumn, TableType, Terminal, render_table
 

spalloc_client/scripts/support.py

@@ -18,7 +18,7 @@
 
 from spinn_utilities.abstract_base import AbstractBase, abstractmethod
 
-from spalloc_client import (
+from spalloc_client.protocol_client import (
     ProtocolClient,
     ProtocolError,
     ProtocolTimeoutError,

spalloc_client/scripts/where_is.py

@@ -70,7 +70,8 @@
 
 from spinn_utilities.overrides import overrides
 
-from spalloc_client import ProtocolClient, __version__
+from spalloc_client._version import __version__
+from spalloc_client.protocol_client import ProtocolClient
 from spalloc_client.scripts.support import Script, Terminate
 from spalloc_client.spalloc_config import SpallocConfig
 from spalloc_client.term import render_definitions

tests/test_import_checker.py

@@ -0,0 +1,37 @@
+# Copyright (c) 2017 The University of Manchester
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os
+import sys
+import unittest
+
+from spinn_utilities.config_setup import unittest_setup
+from spinn_utilities.testing.import_checker import ImportChecker
+
+
+class TestImportChecker(unittest.TestCase):
+
+    def setUp(self) -> None:
+        unittest_setup()
+
+    def test_imports(self) -> None:
+        class_file = sys.modules[self.__module__].__file__
+        assert class_file is not None
+        abs_class_file = os.path.abspath(class_file)
+        unittest_dir = os.path.dirname(abs_class_file)
+        repo_dir = os.path.dirname(unittest_dir)
+        code_dir = os.path.join(repo_dir, "spalloc_client")
+        checker = ImportChecker(code_dir)
+        self.assertEqual(checker.check_dir(), 0,
+                         "Checking for imports from init files")