From a9caab86960f29a2175299cde909882052807ecb Mon Sep 17 00:00:00 2001 From: Adrian Montagu Date: Thu, 1 Aug 2024 12:20:58 +0100 Subject: [PATCH 1/5] explictly state all folders in test_harness.protocol_verifier --- setup.py | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index ab42966..c7ea3e5 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ #!/usr/bin/env python """Setup script for installation """ -from setuptools import setup, find_packages +from setuptools import setup setup( name='test_harness', @@ -11,7 +11,28 @@ ), author='Freddie Mather', author_email='freddie.mather@smartdcsit.co.uk', - packages=find_packages(), + packages=[ + 'test_harness', + 'test_harness.simulator', + 'test_harness.message_buses', + 'test_harness.config', + 'test_harness.pv_config', + 'test_harness.metrics', + 'test_harness.async_management', + 'test_harness.reporting', + 'test_harness.requests_th', + 'test_harness.results', + 'test_harness.process_manager', + 'test_harness.protocol_verifier', + 'test_harness.protocol_verifier.config', + 'test_harness.protocol_verifier.metrics_and_events', + 'test_harness.protocol_verifier.mocks', + 'test_harness.protocol_verifier.pv_config', + 'test_harness.protocol_verifier.reporting', + 'test_harness.protocol_verifier.requests', + 'test_harness.protocol_verifier.results', + 'test_harness.protocol_verifier.testing_suite', + ], package_dir={"test_harness": "test_harness"}, include_package_data=True, ) From 732ef3eeb7b225a90666c287db4a76e6b6f83e05 Mon Sep 17 00:00:00 2001 From: Adrian Montagu Date: Thu, 1 Aug 2024 12:21:35 +0100 Subject: [PATCH 2/5] add extra folders --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index c7ea3e5..2b74ff7 100644 --- a/setup.py +++ b/setup.py @@ -32,6 +32,8 @@ 'test_harness.protocol_verifier.requests', 'test_harness.protocol_verifier.results', 'test_harness.protocol_verifier.testing_suite', + 'test_harness.protocol_verifier.tests', + 'test_harness.protocol_verifier.utils', ], package_dir={"test_harness": "test_harness"}, include_package_data=True, From 350167e378289596553f989624498f539ee813c2 Mon Sep 17 00:00:00 2001 From: Adrian Montagu Date: Thu, 1 Aug 2024 12:29:30 +0100 Subject: [PATCH 3/5] remove pv_config --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 2b74ff7..5bc25a3 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,6 @@ 'test_harness.simulator', 'test_harness.message_buses', 'test_harness.config', - 'test_harness.pv_config', 'test_harness.metrics', 'test_harness.async_management', 'test_harness.reporting', From 41e71dc3e4f3f6ec085179b2e3d13f1662fc90ab Mon Sep 17 00:00:00 2001 From: Adrian Montagu Date: Thu, 1 Aug 2024 12:32:47 +0100 Subject: [PATCH 4/5] remove test folder --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 5bc25a3..a26b0b1 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,6 @@ 'test_harness.protocol_verifier.requests', 'test_harness.protocol_verifier.results', 'test_harness.protocol_verifier.testing_suite', - 'test_harness.protocol_verifier.tests', 'test_harness.protocol_verifier.utils', ], package_dir={"test_harness": "test_harness"}, From e71b95c64ad6b18eead96b10cafb507af1ff62ce Mon Sep 17 00:00:00 2001 From: Adrian Montagu Date: Thu, 1 Aug 2024 12:38:46 +0100 Subject: [PATCH 5/5] udpate manifest --- MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index b235193..f188f46 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,3 @@ -include test_harness/plus2json.pyz +include test_harness/protocol_verifier/plus2json.pyz include test_harness/config/*.config include test_harness/config/*.yaml \ No newline at end of file