From 3a97fb724ace2d8d6994850dcc6e04a32d9603ac Mon Sep 17 00:00:00 2001
From: dh00601 <dh00601@surrey.ac.uk>
Date: Wed, 29 Dec 2021 13:13:50 +0000
Subject: [PATCH] moved extensions to a dedicated directory
---
binarycpython/utils/grid.py | 24 +++++++++----------
.../{HPC.py => population_extensions/_HPC.py} | 4 ++--
.../_Moe_di_Stefano_2017.py} | 0
.../_analytics.py} | 0
.../_cache.py} | 0
.../_condor.py} | 0
.../_dataIO.py} | 0
.../_distribution_functions.py} | 0
.../_grid_logging.py} | 0
.../_grid_options_defaults.py} | 0
.../_gridcode.py} | 0
.../_metadata.py} | 0
.../_slurm.py} | 0
.../_spacing_functions.py} | 0
.../_version_info.py} | 0
15 files changed, 14 insertions(+), 14 deletions(-)
rename binarycpython/utils/{HPC.py => population_extensions/_HPC.py} (99%)
rename binarycpython/utils/{Moe_di_Stefano_2017.py => population_extensions/_Moe_di_Stefano_2017.py} (100%)
rename binarycpython/utils/{analytics.py => population_extensions/_analytics.py} (100%)
rename binarycpython/utils/{cache.py => population_extensions/_cache.py} (100%)
rename binarycpython/utils/{condor.py => population_extensions/_condor.py} (100%)
rename binarycpython/utils/{dataIO.py => population_extensions/_dataIO.py} (100%)
rename binarycpython/utils/{distribution_functions.py => population_extensions/_distribution_functions.py} (100%)
rename binarycpython/utils/{grid_logging.py => population_extensions/_grid_logging.py} (100%)
rename binarycpython/utils/{grid_options_defaults.py => population_extensions/_grid_options_defaults.py} (100%)
rename binarycpython/utils/{gridcode.py => population_extensions/_gridcode.py} (100%)
rename binarycpython/utils/{metadata.py => population_extensions/_metadata.py} (100%)
rename binarycpython/utils/{slurm.py => population_extensions/_slurm.py} (100%)
rename binarycpython/utils/{spacing_functions.py => population_extensions/_spacing_functions.py} (100%)
rename binarycpython/utils/{version_info.py => population_extensions/_version_info.py} (100%)
diff --git a/binarycpython/utils/grid.py b/binarycpython/utils/grid.py
index 815a53fe1..3f90ab6e3 100644
--- a/binarycpython/utils/grid.py
+++ b/binarycpython/utils/grid.py
@@ -65,18 +65,18 @@ from binarycpython.utils.dicts import (
keys_to_floats,
)
-from binarycpython.utils.analytics import analytics
-from binarycpython.utils.cache import cache
-from binarycpython.utils.dataIO import dataIO
-from binarycpython.utils.distribution_functions import distribution_functions
-from binarycpython.utils.grid_logging import grid_logging
-from binarycpython.utils.grid_options_defaults import grid_options_defaults
-from binarycpython.utils.gridcode import gridcode
-from binarycpython.utils.HPC import HPC
-from binarycpython.utils.metadata import metadata
-from binarycpython.utils.Moe_di_Stefano_2017 import Moe_di_Stefano_2017
-from binarycpython.utils.spacing_functions import spacing_functions
-from binarycpython.utils.version_info import version_info
+from binarycpython.utils.population_extensions._analytics import analytics
+from binarycpython.utils.population_extensions._cache import cache
+from binarycpython.utils.population_extensions._dataIO import dataIO
+from binarycpython.utils.population_extensions._distribution_functions import distribution_functions
+from binarycpython.utils.population_extensions._grid_logging import grid_logging
+from binarycpython.utils.population_extensions._grid_options_defaults import grid_options_defaults
+from binarycpython.utils.population_extensions._gridcode import gridcode
+from binarycpython.utils.population_extensions._HPC import HPC
+from binarycpython.utils.population_extensions._metadata import metadata
+from binarycpython.utils.population_extensions._Moe_di_Stefano_2017 import Moe_di_Stefano_2017
+from binarycpython.utils.population_extensions._spacing_functions import spacing_functions
+from binarycpython.utils.population_extensions._version_info import version_info
from binarycpython import _binary_c_bindings
diff --git a/binarycpython/utils/HPC.py b/binarycpython/utils/population_extensions/_HPC.py
similarity index 99%
rename from binarycpython/utils/HPC.py
rename to binarycpython/utils/population_extensions/_HPC.py
index ff2ae39ac..eaca05085 100644
--- a/binarycpython/utils/HPC.py
+++ b/binarycpython/utils/population_extensions/_HPC.py
@@ -17,8 +17,8 @@ import glob
import json
import os
-from binarycpython.utils.slurm import slurm
-from binarycpython.utils.condor import condor
+from binarycpython.utils.population_extensions._slurm import slurm
+from binarycpython.utils.population_extensions._condor import condor
class HPC(condor, slurm):
diff --git a/binarycpython/utils/Moe_di_Stefano_2017.py b/binarycpython/utils/population_extensions/_Moe_di_Stefano_2017.py
similarity index 100%
rename from binarycpython/utils/Moe_di_Stefano_2017.py
rename to binarycpython/utils/population_extensions/_Moe_di_Stefano_2017.py
diff --git a/binarycpython/utils/analytics.py b/binarycpython/utils/population_extensions/_analytics.py
similarity index 100%
rename from binarycpython/utils/analytics.py
rename to binarycpython/utils/population_extensions/_analytics.py
diff --git a/binarycpython/utils/cache.py b/binarycpython/utils/population_extensions/_cache.py
similarity index 100%
rename from binarycpython/utils/cache.py
rename to binarycpython/utils/population_extensions/_cache.py
diff --git a/binarycpython/utils/condor.py b/binarycpython/utils/population_extensions/_condor.py
similarity index 100%
rename from binarycpython/utils/condor.py
rename to binarycpython/utils/population_extensions/_condor.py
diff --git a/binarycpython/utils/dataIO.py b/binarycpython/utils/population_extensions/_dataIO.py
similarity index 100%
rename from binarycpython/utils/dataIO.py
rename to binarycpython/utils/population_extensions/_dataIO.py
diff --git a/binarycpython/utils/distribution_functions.py b/binarycpython/utils/population_extensions/_distribution_functions.py
similarity index 100%
rename from binarycpython/utils/distribution_functions.py
rename to binarycpython/utils/population_extensions/_distribution_functions.py
diff --git a/binarycpython/utils/grid_logging.py b/binarycpython/utils/population_extensions/_grid_logging.py
similarity index 100%
rename from binarycpython/utils/grid_logging.py
rename to binarycpython/utils/population_extensions/_grid_logging.py
diff --git a/binarycpython/utils/grid_options_defaults.py b/binarycpython/utils/population_extensions/_grid_options_defaults.py
similarity index 100%
rename from binarycpython/utils/grid_options_defaults.py
rename to binarycpython/utils/population_extensions/_grid_options_defaults.py
diff --git a/binarycpython/utils/gridcode.py b/binarycpython/utils/population_extensions/_gridcode.py
similarity index 100%
rename from binarycpython/utils/gridcode.py
rename to binarycpython/utils/population_extensions/_gridcode.py
diff --git a/binarycpython/utils/metadata.py b/binarycpython/utils/population_extensions/_metadata.py
similarity index 100%
rename from binarycpython/utils/metadata.py
rename to binarycpython/utils/population_extensions/_metadata.py
diff --git a/binarycpython/utils/slurm.py b/binarycpython/utils/population_extensions/_slurm.py
similarity index 100%
rename from binarycpython/utils/slurm.py
rename to binarycpython/utils/population_extensions/_slurm.py
diff --git a/binarycpython/utils/spacing_functions.py b/binarycpython/utils/population_extensions/_spacing_functions.py
similarity index 100%
rename from binarycpython/utils/spacing_functions.py
rename to binarycpython/utils/population_extensions/_spacing_functions.py
diff --git a/binarycpython/utils/version_info.py b/binarycpython/utils/population_extensions/_version_info.py
similarity index 100%
rename from binarycpython/utils/version_info.py
rename to binarycpython/utils/population_extensions/_version_info.py
--
GitLab