Skip to content

Commit

Permalink
Merge branch 'master' into overrides_check
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian-B committed Jan 15, 2024
2 parents 1d2473c + 3080b84 commit b8359df
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion gfe_examples/live_io/live_io.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def start_sending(label, c):


def end_sim(label, c):
# pylint: disable=unused-argument
# pylint: disable=unused-argument,global-statement
global running
running = False

Expand Down
2 changes: 2 additions & 0 deletions spinnaker_graph_front_end/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ def setup(model_binary_module=None,
:raise ~spinn_front_end_common.utilities.exceptions.ConfigurationException:
if mutually exclusive options are given.
"""
# pylint: disable=global-statement
global __simulator
# pylint: disable=redefined-outer-name
logger.info(
Expand Down Expand Up @@ -223,6 +224,7 @@ def add_machine_vertex_instance(machine_vertex):
app_vertex = AbstractOneAppOneMachineVertex(
machine_vertex, machine_vertex.label)
FecDataView.add_vertex(app_vertex)
# pylint: disable=protected-access
machine_vertex._app_vertex = app_vertex


Expand Down

0 comments on commit b8359df

Please sign in to comment.