Merge branch 'master' into OSI_Approved_Apache_Software_License

SpiNNakerManchester · Oct 3, 2023 · 84d617a · 84d617a
2 parents 0511f97 + ad91315
commit 84d617a
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 30 deletions.
diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml
@@ -29,9 +29,9 @@ jobs:
         python-version: 3.8
 
     - 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/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml
@@ -28,9 +28,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
@@ -41,7 +41,7 @@ jobs:
       uses: ./support/actions/install-spinn-deps
       with:
         repositories: >
-          SpiNNUtils SpiNNMachine SpiNNMan PACMAN DataSpecification spalloc
+          SpiNNUtils SpiNNMachine SpiNNMan PACMAN spalloc
           SpiNNFrontEndCommon sPyNNaker TestBase
         install: true
 

diff --git a/.ratexcludes b/.ratexcludes
@@ -4,7 +4,6 @@
 **/SpiNNMachine/**
 **/SpiNNMan/**
 **/PACMAN/**
-**/DataSpecification/**
 **/spalloc/**
 **/SpiNNFrontEndCommon/**
 **/sPyNNaker/**

diff --git a/examples/breakout/Automated.ipynb b/examples/breakout/Automated.ipynb
@@ -7,7 +7,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import spynnaker8 as p\n",
+    "import pyNN.spiNNaker as p\n",
     "from spinn_gym.games.breakout.visualise_jupyter import jupyter_visualiser\n",
     "from spinn_gym.games.breakout.automated_breakout import (\n",
     "    AutomatedBreakout, X_RES, X_SCALE, Y_RES, Y_SCALE)\n",
@@ -73,4 +73,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 5
-}
+}
diff --git a/examples/breakout/Neuromodulated.ipynb b/examples/breakout/Neuromodulated.ipynb
@@ -7,7 +7,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import spynnaker8 as p\n",
+    "import pyNN.spiNNaker as p\n",
     "from spinn_gym.games.breakout.visualise_jupyter import jupyter_visualiser\n",
     "from spinn_gym.games.breakout.neuromodulated_breakout import (\n",
     "    NeuromodulatedBreakout, X_RES, X_SCALE, Y_RES, Y_SCALE)\n",
@@ -73,4 +73,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 5
-}
+}
diff --git a/setup.cfg b/setup.cfg
@@ -45,7 +45,7 @@ packages = find:
 zip_safe = True
 include_package_data = True
 install_requires =
-        sPyNNaker == 1!6.0.1
+        sPyNNaker == 1!7.1.1
         opencv-python
 
 [options.packages.find]
@@ -60,6 +60,6 @@ include =
 
 [options.extras_require]
 test =
-        SpiNNakerTestBase == 1!6.0.1
+        SpiNNakerTestBase == 1!7.1.1
         # pytest will be brought in by pytest-cov
         pytest-cov
diff --git a/spinn_gym/_version.py b/spinn_gym/_version.py
@@ -13,8 +13,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-__version__ = "1!6.0.1"
-__version_month__ = "May"
-__version_year__ = "2021"
+__version__ = "1!7.1.1"
+__version_month__ = "TBD"
+__version_year__ = "TBD"
 __version_day__ = "TBD"
-__version_name__ = "Not yet released"
+__version_name__ = "Post_HBP"
diff --git a/spinn_gym/games/breakout/breakout_machine_vertex.py b/spinn_gym/games/breakout/breakout_machine_vertex.py
@@ -17,8 +17,6 @@
 
 from spinn_utilities.overrides import overrides
 
-from data_specification.enums.data_type import DataType
-
 # SpinnFrontEndCommon imports
 from spinn_front_end_common.utilities import helpful_functions
 from spinn_front_end_common.abstract_models.\
@@ -29,6 +27,7 @@
     import AbstractHasAssociatedBinary
 from spinn_front_end_common.interface.buffer_management \
     import recording_utilities
+from spinn_front_end_common.interface.ds import DataType
 from spinn_front_end_common.interface.simulation import simulation_utilities
 from spinn_front_end_common.utilities import constants as \
     front_end_common_constants

diff --git a/spinn_gym/games/breakout/random_breakout.py b/spinn_gym/games/breakout/random_breakout.py
@@ -11,8 +11,8 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-import spynnaker8 as p
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+import pyNN.spiNNaker as p
 from spinn_gym import Breakout
 from .breakout_sim import (
     subsample_connection, row_col_to_input_breakout)

diff --git a/spinn_gym/games/double_inverted_pendulum/double_pendulum_machine_vertex.py b/spinn_gym/games/double_inverted_pendulum/double_pendulum_machine_vertex.py
@@ -17,14 +17,13 @@
 
 from spinn_utilities.overrides import overrides
 
-from data_specification.enums.data_type import DataType
-
 # SpinnFrontEndCommon imports
 from spinn_front_end_common.utilities import helpful_functions
 from spinn_front_end_common.abstract_models.abstract_has_associated_binary \
     import AbstractHasAssociatedBinary
 from spinn_front_end_common.interface.buffer_management \
     import recording_utilities
+from spinn_front_end_common.interface.ds import DataType
 from spinn_front_end_common.interface.simulation import simulation_utilities
 from spinn_front_end_common.utilities import constants as \
     front_end_common_constants

diff --git a/spinn_gym/games/inverted_pendulum/inverted_pendulum_machine_vertex.py b/spinn_gym/games/inverted_pendulum/inverted_pendulum_machine_vertex.py
@@ -17,8 +17,6 @@
 
 from spinn_utilities.overrides import overrides
 
-from data_specification.enums.data_type import DataType
-
 # SpinnFrontEndCommon imports
 from spinn_front_end_common.utilities import helpful_functions
 from spinn_front_end_common.abstract_models.abstract_has_associated_binary \
@@ -28,6 +26,7 @@
 from spinn_front_end_common.abstract_models \
     .abstract_generates_data_specification \
     import AbstractGeneratesDataSpecification
+from spinn_front_end_common.interface.ds import DataType
 from spinn_front_end_common.interface.simulation import simulation_utilities
 from spinn_front_end_common.utilities import constants as \
     front_end_common_constants

diff --git a/spinn_gym/games/logic/logic_machine_vertex.py b/spinn_gym/games/logic/logic_machine_vertex.py
@@ -18,8 +18,6 @@
 
 from spinn_utilities.overrides import overrides
 
-from data_specification.enums.data_type import DataType
-
 # SpinnFrontEndCommon imports
 from spinn_front_end_common.utilities import helpful_functions
 from spinn_front_end_common.abstract_models.abstract_has_associated_binary \
@@ -29,6 +27,7 @@
 from spinn_front_end_common.abstract_models \
     .abstract_generates_data_specification \
     import AbstractGeneratesDataSpecification
+from spinn_front_end_common.interface.ds import DataType
 from spinn_front_end_common.interface.simulation import simulation_utilities
 from spinn_front_end_common.utilities import constants as \
     front_end_common_constants

diff --git a/spinn_gym/games/multi_arm_bandit/bandit_machine_vertex.py b/spinn_gym/games/multi_arm_bandit/bandit_machine_vertex.py
@@ -18,8 +18,6 @@
 
 from spinn_utilities.overrides import overrides
 
-from data_specification.enums.data_type import DataType
-
 # SpinnFrontEndCommon imports
 from spinn_front_end_common.utilities import helpful_functions
 from spinn_front_end_common.abstract_models.abstract_has_associated_binary \
@@ -29,6 +27,7 @@
 from spinn_front_end_common.abstract_models \
     .abstract_generates_data_specification \
     import AbstractGeneratesDataSpecification
+from spinn_front_end_common.interface.ds import DataType
 from spinn_front_end_common.interface.simulation import simulation_utilities
 from spinn_front_end_common.utilities import constants as \
     front_end_common_constants

diff --git a/spinn_gym/games/store_recall/store_recall_machine_vertex.py b/spinn_gym/games/store_recall/store_recall_machine_vertex.py
@@ -17,8 +17,6 @@
 
 from spinn_utilities.overrides import overrides
 
-from data_specification.enums.data_type import DataType
-
 # SpinnFrontEndCommon imports
 from spinn_front_end_common.utilities import helpful_functions
 from spinn_front_end_common.abstract_models.abstract_has_associated_binary \
@@ -28,6 +26,7 @@
 from spinn_front_end_common.abstract_models \
     .abstract_generates_data_specification \
     import AbstractGeneratesDataSpecification
+from spinn_front_end_common.interface.ds import DataType
 from spinn_front_end_common.interface.simulation import simulation_utilities
 from spinn_front_end_common.utilities import constants as \
     front_end_common_constants