Merge pull request #252 from SpiNNakerManchester/DataType

Move DataType to FEC. Archive DataSpecification
SpiNNakerManchester · Jun 21, 2023 · 7e9651e · 7e9651e
2 parents 7865c26 + 1fb45d7
commit 7e9651e
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 12 deletions.
diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml
@@ -46,7 +46,7 @@ jobs:
       uses: ./support/actions/install-spinn-deps
       with:
         repositories: >
-          SpiNNUtils SpiNNMachine SpiNNMan PACMAN DataSpecification spalloc
+          SpiNNUtils SpiNNMachine SpiNNMan PACMAN spalloc
           SpiNNFrontEndCommon TestBase
         install: true
     - name: Install matplotlib
@@ -100,7 +100,7 @@ jobs:
       uses: ./support/actions/install-spinn-deps
       with:
         repositories: >
-          SpiNNUtils SpiNNMachine SpiNNMan PACMAN DataSpecification spalloc
+          SpiNNUtils SpiNNMachine SpiNNMan PACMAN spalloc
           SpiNNFrontEndCommon TestBase
         install: true
     - name: Install matplotlib

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

diff --git a/doc/doc_requirements.txt b/doc/doc_requirements.txt
@@ -16,6 +16,5 @@
 -e git+https://github.com/SpiNNakerManchester/SpiNNMachine.git@master#egg=SpiNNMachine
 -e git+https://github.com/SpiNNakerManchester/SpiNNMan.git@master#egg=spinnman
 -e git+https://github.com/SpiNNakerManchester/PACMAN.git@master#egg=spinnaker-pacman
--e git+https://github.com/SpiNNakerManchester/DataSpecification.git@master#egg=spinnaker-dataspecification
 -e git+https://github.com/SpiNNakerManchester/spalloc.git@master#egg=spalloc
 -e git+https://github.com/SpiNNakerManchester/SpiNNFrontEndCommon.git@master#egg=spinnfrontendcommon
diff --git a/pypi_to_import b/pypi_to_import
@@ -2,5 +2,4 @@ SpiNNUtilities:spinn_utilities
 SpiNNMachine:spinn_machine
 SpiNNMan:spinnman
 SpiNNaker_PACMAN:pacman
-SpiNNaker_DataSpecification:data_specification
 SpiNNFrontEndCommon:spinn_front_end_common
diff --git a/unittests/test_version.py b/unittests/test_version.py
@@ -15,7 +15,6 @@
 import unittest
 import spinn_utilities
 import spinn_machine
-import data_specification
 import pacman
 import spinnman
 import spinn_front_end_common
@@ -32,7 +31,6 @@ class Test(unittest.TestCase):
     def test_compare_versions(self):
         spinn_utilities_parts = spinn_utilities.__version__.split('.')
         spinn_machine_parts = spinn_machine.__version__.split('.')
-        data_specification_parts = data_specification.__version__.split('.')
         pacman_parts = pacman.__version__.split('.')
         spinnman_parts = spinnman.__version__.split('.')
         spinn_front_end_common_parts = spinn_front_end_common.\
@@ -50,11 +48,6 @@ def test_compare_versions(self):
         self.assertLessEqual(spinn_machine_parts[1],
                              spinnaker_graph_front_end_parts[1])
 
-        self.assertEqual(data_specification_parts[0],
-                         spinnaker_graph_front_end_parts[0])
-        self.assertLessEqual(data_specification_parts[1],
-                             spinnaker_graph_front_end_parts[1])
-
         self.assertEqual(pacman_parts[0],
                          spinnaker_graph_front_end_parts[0])
         self.assertLessEqual(pacman_parts[1],