From 5f06c93caa67351dcde1d2973d5647aa50535b14 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Tue, 20 Jun 2023 14:00:53 +0100 Subject: [PATCH 1/2] remove links to DataSpecifation reporitory --- .github/workflows/python_actions.yml | 4 ++-- .ratexcludes | 1 - doc/doc_requirements.txt | 1 - pypi_to_import | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index 0e12c799..e4bd98ee 100644 --- 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 index 43c9bf55..4c20690a 100644 --- 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 index 60f1c4d3..b6274ebe 100644 --- 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 index c859ad4b..e29e0dc8 100644 --- 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 \ No newline at end of file From 1fb45d7a1da2b659e1451059e0073d68b1e27feb Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Tue, 20 Jun 2023 14:47:22 +0100 Subject: [PATCH 2/2] remove ds test --- unittests/test_version.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/unittests/test_version.py b/unittests/test_version.py index 7c1ec2b6..b65eab67 100644 --- 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],