Merge branch 'master' into better_board_testing

SpiNNakerManchester · Sep 15, 2023 · b0e9c5f · b0e9c5f
2 parents a5bd8ec + e02ab1b
commit b0e9c5f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml
@@ -31,9 +31,9 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Checkout SupportScripts
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: SpiNNakerManchester/SupportScripts
         path: support
@@ -78,9 +78,9 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Checkout SupportScripts
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: SpiNNakerManchester/SupportScripts
         path: support

diff --git a/spinnman/processes/get_machine_process.py b/spinnman/processes/get_machine_process.py
@@ -18,7 +18,7 @@
 import functools
 from os.path import join
 from spinn_utilities.config_holder import (
-    get_config_bool, get_config_int, get_config_str)
+    get_config_bool, get_config_int_or_none, get_config_str_or_none)
 from spinn_utilities.data import UtilsDataView
 from spinn_utilities.log import FormatAdapter
 from spinn_machine import (Router, Chip, Link)
@@ -114,7 +114,7 @@ def _make_chip(self, chip_info, machine):
 
         # Create the chip's SDRAM object
         sdram_size = chip_info.largest_free_sdram_block
-        max_sdram_size = get_config_int(
+        max_sdram_size = get_config_int_or_none(
             "Machine", "max_sdram_allowed_per_chip")
         if (max_sdram_size is not None and
                 sdram_size > max_sdram_size):
@@ -294,7 +294,7 @@ def _process_ignore_links(self, machine):
             An empty machine to handle wrap-arounds
         """
         for ignore in IgnoreLink.parse_string(
-                get_config_str("Machine", "down_links")):
+                get_config_str_or_none("Machine", "down_links")):
             global_xy = self._ignores_local_to_global(
                 ignore.x, ignore.y, ignore.ip_address, machine)
             if global_xy is None:
@@ -343,7 +343,7 @@ def _preprocess_ignore_cores(self, machine):
         """
         # Convert by ip to global
         for ignore in IgnoreCore.parse_string(
-                get_config_str("Machine", "down_cores")):
+                get_config_str_or_none("Machine", "down_cores")):
             global_xy = self._ignores_local_to_global(
                 ignore.x, ignore.y, ignore.ip_address, machine)
             if global_xy is None:
@@ -367,7 +367,7 @@ def _preprocess_ignore_chips(self, machine):
             An empty machine to handle wrap-arounds
         """
         for ignore in IgnoreChip.parse_string(
-                get_config_str("Machine", "down_chips")):
+                get_config_str_or_none("Machine", "down_chips")):
             # Convert by ip to global
             global_xy = self._ignores_local_to_global(
                 ignore.x, ignore.y, ignore.ip_address, machine)