removed the need for the rawdata directory to be present in delivery

apps/cli/executables/delivery/delivery/products.py

@@ -48,7 +48,7 @@ class ExecutionBlock(SpooledProduct):
     def deliver_to(self, destination: Destination):
         eb_name = self.path.absolute().name
         # let's use our directory name as the relative path
-        destination.add_directory((self.path / "rawdata" / eb_name), eb_name)
+        destination.add_directory(self.path, eb_name)
 
 
 # Future types of product that might be needed:

apps/cli/executables/delivery/test/test_cli.py

@@ -20,7 +20,7 @@ def test_local_rawdata_no_tar(tmpdir_factory):
     main(["-r", "-l", temp_directory, test_data_path])
     # compare the source and destination
     compare_dirs = filecmp.dircmp(
-        temp_directory + "/" + eb_name, (test_data_path + eb_name + "/rawdata/" + eb_name)
+        temp_directory + "/" + eb_name, (test_data_path + eb_name)
     )
     # did the comparison report they are the same
     assert (
@@ -48,7 +48,7 @@ def test_local_rawdata_with_tar(tmpdir_factory):
     assert os.path.exists(temp_directory + "/extracted/" + eb_name)
     # compare the extracted results with the source
     compare_dirs = filecmp.dircmp(
-        temp_directory + "/extracted/" + eb_name, (test_data_path + eb_name + "/rawdata/" + eb_name)
+        temp_directory + "/extracted/" + eb_name, (test_data_path + eb_name)
     )
     # is the source and extracted the same
     assert (
@@ -73,7 +73,7 @@ def test_web_rawdata_no_tar(tmpdir_factory):
         destination_path = Delivery().deliver(test_context)
     # compare the source and destination
     compare_dirs = filecmp.dircmp(
-        destination_path / eb_name, f"{test_data_path}{eb_name}/rawdata/{eb_name}"
+        destination_path / eb_name, f"{test_data_path}{eb_name}"
     )
     # did the comparison report they are the same
     assert (
@@ -105,7 +105,7 @@ def test_web_rawdata_with_tar(tmpdir_factory):
     assert os.path.exists(temp_directory + "/extracted/" + eb_name)
     # compare the extracted results with the source
     compare_dirs = filecmp.dircmp(
-        temp_directory + "/extracted/" + eb_name, (test_data_path + eb_name + "/rawdata/" + eb_name)
+        temp_directory + "/extracted/" + eb_name, (test_data_path + eb_name)
     )
     # is the source and extracted the same
     assert (