Merge branch 'master' into remove_n_boards

.github/workflows/c_actions.yml

@@ -35,11 +35,11 @@ jobs:
       uses: ./support/actions/apt-get-install
       with:
         packages: doxygen gcc-arm-none-eabi
-    - name: "Prepare: Set up Python 3.8"
+    - name: "Prepare: Set up Python 3.12"
       # Note: Python is needed for spinn_utilities.make_tools when building
       uses: actions/setup-python@v4
       with:
-        python-version: 3.8
+        python-version: 3.12
     - name: "Prepare: Set SPINN_DIRS"
       run: |
         echo "Set SPINN_DIRS to $PWD/spinnaker_tools"

.github/workflows/python_actions.yml

@@ -26,7 +26,7 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        python-version: [3.8, 3.9, "3.10", "3.11"]
+        python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
 
     steps:
     - name: Checkout
@@ -60,7 +60,7 @@ jobs:
       uses: ./support/actions/pytest
       with:
         tests: unittests fec_integration_tests
-        coverage: ${{ matrix.python-version == 3.8 }}
+        coverage: ${{ matrix.python-version == 3.12 }}
         cover-packages: ${{ env.BASE_PKG }}
         coveralls-token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -79,7 +79,7 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        python-version: [3.8]
+        python-version: [3.12]
 
     steps:
     - name: Checkout

doc/source/conf.py

@@ -55,7 +55,7 @@
 spinnaker_doc_version = "latest"
 
 intersphinx_mapping = {
-    'python': ('https://docs.python.org/3.8', None),
+    'python': ('https://docs.python.org/3.12', None),
     'numpy': ("https://numpy.org/doc/1.19/", None),
     'spinn_utilities': (
         f'https://spinnutils.readthedocs.io/en/{spinnaker_doc_version}/',

setup.cfg

@@ -30,18 +30,18 @@ classifiers =
         Operating System :: Microsoft :: Windows
         Operating System :: MacOS
         Programming Language :: Python :: 3
-        Programming Language :: Python :: 3.7
         Programming Language :: Python :: 3.8
         Programming Language :: Python :: 3.9
         Programming Language :: Python :: 3.10
         Programming Language :: Python :: 3.11
+        Programming Language :: Python :: 3.12
 maintainer = SpiNNakerTeam
 maintainer_email = [email protected]
 keywords =
         spinnaker
 
 [options]
-python_requires = >=3.7, <4
+python_requires = >=3.8, <4
 packages = find:
 zip_safe = True
 include_package_data = True

setup.py

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import distutils.dir_util
 from setuptools import setup
+import shutil
 import os
 import sys
 
@@ -26,8 +26,8 @@
         this_dir = os.path.dirname(os.path.abspath(__file__))
         build_dir = os.path.join(this_dir, "build")
         if os.path.isdir(build_dir):
-            distutils.dir_util.remove_tree(build_dir)
+            shutil.rmtree(build_dir)
         egg_dir = os.path.join(this_dir, "SpiNNFrontEndCommon.egg-info")
         if os.path.isdir(egg_dir):
-            distutils.dir_util.remove_tree(egg_dir)
+            shutil.rmtree(egg_dir)
     setup()

spinn_front_end_common/interface/provenance/fec_timer.py

@@ -12,11 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from __future__ import annotations
+from collections.abc import Sized
 import logging
 import os
 import time
 from datetime import timedelta
-from typing import List, Optional, Sized, Union, TYPE_CHECKING
+from typing import List, Optional, Union, TYPE_CHECKING
 from typing_extensions import Literal, Self
 from spinn_utilities.config_holder import (get_config_bool)
 from spinn_utilities.log import FormatAdapter

spinn_front_end_common/interface/provenance/provenance_reader.py

@@ -148,7 +148,7 @@ def get_provenance_for_router(self, x: int, y: int) -> str:
             ORDER BY description
             """
         return "\n".join(
-            f"{ cast(str, row[0]) }: { cast(int, row[1]) }"
+            f"{cast(str, row[0])}: {cast(int, row[1])}"
             for row in self.run_query(query, [int(x), int(y)]))
 
     def get_cores_with_provenace(self) -> List[XYP]:

spinn_front_end_common/utilities/iobuf_extractor.py

@@ -12,10 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from collections.abc import Sized
 import logging
 import os
 import re
-from typing import List, Optional, Pattern, Sequence, Set, Sized, Tuple, Union
+from typing import List, Optional, Pattern, Sequence, Set, Tuple, Union
 from spinn_utilities.log import FormatAdapter
 from spinn_utilities.make_tools.replacer import Replacer
 from spinn_utilities.progress_bar import ProgressBar

spinn_front_end_common/utility_models/command_sender_machine_vertex.py

@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from __future__ import annotations
+from collections.abc import Sized
 from enum import IntEnum
 from typing import (
-    Callable, Dict, Iterable, List, Sequence, Set, Sized, Tuple, Type, TypeVar,
+    Callable, Dict, Iterable, List, Sequence, Set, Tuple, Type, TypeVar,
     TYPE_CHECKING)
 from spinn_utilities.overrides import overrides
 from spinnman.model.enums import ExecutableType