From 904902736610075a10d6c0b19ce954a8575166c3 Mon Sep 17 00:00:00 2001 From: Ryan Lyttle Date: Mon, 27 Jul 2026 14:26:10 +0100 Subject: [PATCH 1/2] fixed cache dir bug Changed cache_dir to default to str(pooch.os_cache("layup")) instead of None in LayupObservatory. Stops layup_furnish_spiceypy from searching for files in the Sorcha created cache. --- src/layup/utilities/data_processing_utilities.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layup/utilities/data_processing_utilities.py b/src/layup/utilities/data_processing_utilities.py index a1b3186a..a3bc2e47 100644 --- a/src/layup/utilities/data_processing_utilities.py +++ b/src/layup/utilities/data_processing_utilities.py @@ -356,7 +356,7 @@ class LayupObservatory(SorchaObservatory): A wrapper around Sorcha's Observatory class to provide additional functionality for Layup. """ - def __init__(self, cache_dir=None): + def __init__(self, cache_dir=str(pooch.os_cache("layup"))): """Create an instance of the LayupObservatory class. Parameters From f8965aafe2ddc9bb060bb807c3ed3aa853280285 Mon Sep 17 00:00:00 2001 From: Ryan Lyttle Date: Mon, 27 Jul 2026 17:47:20 +0100 Subject: [PATCH 2/2] Changed "layup" to be a global variable and a short comment to explain it --- src/layup/utilities/data_processing_utilities.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/layup/utilities/data_processing_utilities.py b/src/layup/utilities/data_processing_utilities.py index a3bc2e47..0dd77e19 100644 --- a/src/layup/utilities/data_processing_utilities.py +++ b/src/layup/utilities/data_processing_utilities.py @@ -59,6 +59,10 @@ logger = logging.getLogger(__name__) +# default Cache directory name where the layup auxiliary files are stored when layup bootstrap is ran +# eg on Mac ~/Library/Caches/layup +cache_dir_name = "layup" + def write_fallback_obscodes(): """Decompress the observatory-codes file bundled with layup to a plain JSON @@ -356,7 +360,7 @@ class LayupObservatory(SorchaObservatory): A wrapper around Sorcha's Observatory class to provide additional functionality for Layup. """ - def __init__(self, cache_dir=str(pooch.os_cache("layup"))): + def __init__(self, cache_dir=str(pooch.os_cache(cache_dir_name))): """Create an instance of the LayupObservatory class. Parameters