split functionality file across new module as was getting too long on its own. All functions remian the same, but imports will need to be updated.

tests/shared.py

@@ -6,7 +6,7 @@ Author(s): David Marchant
 import os
 
 from core.correctness.vars import DEFAULT_JOB_OUTPUT_DIR, DEFAULT_JOB_QUEUE_DIR
-from core.functionality import make_dir, rmtree
+from functionality.file_io import make_dir, rmtree
 
 
 # testing 

tests/test_conductors.py

@@ -11,11 +11,12 @@ from core.correctness.vars import JOB_TYPE_PYTHON, SHA256, JOB_PARAMETERS, \
     STATUS_DONE, JOB_TYPE_PAPERMILL, JOB_RECIPE, JOB_RULE, JOB_CREATE_TIME, \
     JOB_REQUIREMENTS, EVENT_PATH, EVENT_RULE, EVENT_TYPE, \
     EVENT_TYPE_WATCHDOG, get_base_file, get_result_file, get_job_file
-from core.functionality import get_file_hash, create_watchdog_event, \
-    create_job, make_dir, write_yaml, write_notebook, read_yaml, write_file, \
-    lines_to_string, read_file
 from core.meow import create_rule
 from conductors import LocalPythonConductor
+from functionality.file_io import read_file, read_yaml, write_file, \
+    write_notebook, write_yaml, lines_to_string, make_dir
+from functionality.hashing import get_file_hash
+from functionality.meow import create_watchdog_event, create_job
 from patterns import FileEventPattern
 from recipes.jupyter_notebook_recipe import JupyterNotebookRecipe, \
     papermill_job_func
@@ -24,7 +25,6 @@ from shared import setup, teardown, TEST_MONITOR_BASE, APPENDING_NOTEBOOK, \
     TEST_JOB_OUTPUT, TEST_JOB_QUEUE, COMPLETE_PYTHON_SCRIPT, \
     BAREBONES_PYTHON_SCRIPT, BAREBONES_NOTEBOOK
 
-
 def failing_func():
     raise Exception("bad function")
  

tests/test_functionality.py

@@ -13,15 +13,20 @@ from core.correctness.vars import CHAR_LOWERCASE, CHAR_UPPERCASE, \
     PYTHON_FUNC, JOB_ID, JOB_EVENT, \
     JOB_TYPE, JOB_PATTERN, JOB_RECIPE, JOB_RULE, JOB_STATUS, JOB_CREATE_TIME, \
     JOB_REQUIREMENTS, STATUS_QUEUED, JOB_TYPE_PAPERMILL
-from core.functionality import generate_id, wait, get_file_hash, rmtree, \
-    make_dir, parameterize_jupyter_notebook, create_event, create_job, \
-    replace_keywords, write_yaml, write_notebook, read_yaml, read_notebook, \
-    create_watchdog_event, lines_to_string, \
-    parameterize_python_script, write_file, read_file, read_file_lines, \
-    KEYWORD_PATH, KEYWORD_REL_PATH, KEYWORD_DIR, KEYWORD_REL_DIR, \
-    KEYWORD_FILENAME, KEYWORD_PREFIX, KEYWORD_BASE, KEYWORD_EXTENSION, \
-    KEYWORD_JOB
 from core.meow import create_rule
+from functionality.file_io import lines_to_string, make_dir, read_file, \
+    read_file_lines, read_notebook, read_yaml, rmtree, write_file, \
+    write_notebook, write_yaml    
+from functionality.hashing import get_file_hash
+from functionality.meow import create_event, create_job, \
+    create_watchdog_event, replace_keywords, \
+    KEYWORD_BASE, KEYWORD_DIR, KEYWORD_EXTENSION, KEYWORD_FILENAME, \
+    KEYWORD_JOB, KEYWORD_PATH, KEYWORD_PREFIX, KEYWORD_REL_DIR, \
+    KEYWORD_REL_PATH
+from functionality.naming import generate_id
+from functionality.parameterisation import parameterize_jupyter_notebook, \
+    parameterize_python_script
+from functionality.process_io import wait
 from patterns import FileEventPattern
 from recipes import JupyterNotebookRecipe
 from shared import setup, teardown, TEST_MONITOR_BASE, COMPLETE_NOTEBOOK, \

tests/test_patterns.py

@@ -8,13 +8,14 @@ from multiprocessing import Pipe
 from core.correctness.vars import FILE_CREATE_EVENT, EVENT_TYPE, \
     EVENT_RULE, WATCHDOG_BASE, EVENT_TYPE_WATCHDOG, EVENT_PATH, SWEEP_START, \
     SWEEP_JUMP, SWEEP_STOP
-from core.functionality import make_dir
+from functionality.file_io import make_dir
 from patterns.file_event_pattern import FileEventPattern, WatchdogMonitor, \
     _DEFAULT_MASK
 from recipes import JupyterNotebookRecipe
 from shared import setup, teardown, BAREBONES_NOTEBOOK, TEST_MONITOR_BASE
 
 
+
 def patterns_equal(tester, pattern_one, pattern_two):
     tester.assertEqual(pattern_one.name, pattern_two.name)
     tester.assertEqual(pattern_one.recipe, pattern_two.recipe)

tests/test_recipes.py

@@ -13,10 +13,11 @@ from core.correctness.vars import EVENT_TYPE, WATCHDOG_BASE, EVENT_RULE, \
     PARAMS_FILE, SWEEP_STOP, SWEEP_JUMP, SWEEP_START, JOB_TYPE_PAPERMILL, \
     get_base_file, get_job_file, get_result_file
 from core.correctness.validation import valid_job
-from core.functionality import get_file_hash, create_job, \
-    create_watchdog_event, make_dir, write_yaml, write_notebook, read_yaml, \
-    write_file, lines_to_string
 from core.meow import create_rules, create_rule
+from functionality.file_io import lines_to_string, make_dir, read_yaml, \
+    write_file, write_notebook, write_yaml
+from functionality.hashing import get_file_hash
+from functionality.meow import create_job, create_watchdog_event
 from patterns.file_event_pattern import FileEventPattern
 from recipes.jupyter_notebook_recipe import JupyterNotebookRecipe, \
     PapermillHandler, papermill_job_func

tests/test_runner.py

@@ -8,9 +8,9 @@ from time import sleep
 from conductors import LocalPythonConductor
 from core.correctness.vars import get_result_file, \
     JOB_TYPE_PAPERMILL, JOB_ERROR, META_FILE, JOB_TYPE_PYTHON, JOB_CREATE_TIME
-from core.functionality import make_dir, read_notebook, read_yaml, read_file
 from core.meow import BaseMonitor, BaseHandler, BaseConductor
 from core.runner import MeowRunner
+from functionality.file_io import make_dir, read_file, read_notebook, read_yaml
 from patterns.file_event_pattern import WatchdogMonitor, FileEventPattern
 from recipes.jupyter_notebook_recipe import PapermillHandler, \
     JupyterNotebookRecipe

tests/test_validation.py

@@ -9,12 +9,13 @@ from typing import Any, Union
 from core.correctness.validation import check_type, check_implementation, \
     valid_string, valid_dict, valid_list, valid_existing_file_path, \
     valid_dir_path, valid_non_existing_path, valid_event, valid_job, \
-    setup_debugging, valid_watchdog_event, check_callable
+    valid_watchdog_event, check_callable
 from core.correctness.vars import VALID_NAME_CHARS, SHA256, EVENT_TYPE, \
     EVENT_PATH, JOB_TYPE, JOB_EVENT, JOB_ID, JOB_PATTERN, JOB_RECIPE, \
     JOB_RULE, JOB_STATUS, JOB_CREATE_TIME, EVENT_RULE, WATCHDOG_BASE, \
     WATCHDOG_HASH
-from core.functionality import make_dir
+from functionality.debug import setup_debugging
+from functionality.file_io import make_dir
 from shared import setup, teardown, TEST_MONITOR_BASE
 
 class CorrectnessTests(unittest.TestCase):