Refactor the repo (#64)

baseclasses/__init__.py

@@ -1,27 +1,24 @@
 __version__ = "1.5.2"
 
-from .pyAero_problem import AeroProblem
-from .pyTransi_problem import TransiProblem
-from .pyStruct_problem import StructProblem
-from .pyAeroStruct_problem import AeroStructProblem
-
-from .pyAero_solver import AeroSolver
-from .BaseSolver import BaseSolver
-
-from .pyMission_problem import MissionProblem
-from .pyMission_problem import MissionProfile
-from .pyMission_problem import MissionSegment
-
-from .pyWeight_problem import WeightProblem
-from .pyWeight_problem import FuelCase
-
-from .FluidProperties import FluidProperties
-from .ICAOAtmosphere import ICAOAtmosphere
-from .pyEngine_problem import EngineProblem
-
-from .pyFieldPerformance_problem import FieldPerformanceProblem
-
-from .pyLG_problem import LGProblem
-
-from .py3Util import getPy3SafeString
-from .BaseRegTest import BaseRegTest
+from .problems import (
+    AeroProblem,
+    TransiProblem,
+    StructProblem,
+    AeroStructProblem,
+    MissionProblem,
+    MissionProfile,
+    MissionSegment,
+    WeightProblem,
+    FuelCase,
+    FluidProperties,
+    ICAOAtmosphere,
+    EngineProblem,
+    FieldPerformanceProblem,
+    LGProblem,
+)
+
+from .solvers import BaseSolver, AeroSolver
+
+from .utils import getPy3SafeString
+
+from .testing import BaseRegTest, getTol

baseclasses/problems/__init__.py

@@ -0,0 +1,11 @@
+from .pyAero_problem import AeroProblem
+from .pyTransi_problem import TransiProblem
+from .pyStruct_problem import StructProblem
+from .pyAeroStruct_problem import AeroStructProblem
+from .pyMission_problem import MissionProblem, MissionProfile, MissionSegment
+from .pyWeight_problem import WeightProblem, FuelCase
+from .FluidProperties import FluidProperties
+from .ICAOAtmosphere import ICAOAtmosphere
+from .pyEngine_problem import EngineProblem
+from .pyFieldPerformance_problem import FieldPerformanceProblem
+from .pyLG_problem import LGProblem

baseclasses/pyAeroStruct_problem.py → baseclasses/problems/pyAeroStruct_problem.py

@@ -6,7 +6,7 @@
 # ======================================================================
 from .pyAero_problem import AeroProblem
 from .pyStruct_problem import StructProblem
-from .utils import Error
+from ..utils import Error
 
 
 class AeroStructProblem:

baseclasses/pyAero_problem.py → baseclasses/problems/pyAero_problem.py

@@ -9,7 +9,7 @@
 import warnings
 from .ICAOAtmosphere import ICAOAtmosphere
 from .FluidProperties import FluidProperties
-from .utils import CaseInsensitiveDict, Error
+from ..utils import CaseInsensitiveDict, Error
 
 
 class AeroProblem(FluidProperties):

baseclasses/pyEngine_problem.py → baseclasses/problems/pyEngine_problem.py

@@ -5,7 +5,7 @@
 # =============================================================================
 # Imports
 # =============================================================================
-from baseclasses import AeroProblem
+from .pyAero_problem import AeroProblem
 
 
 class EngineProblem(AeroProblem):

baseclasses/pyFieldPerformance_problem.py → baseclasses/problems/pyFieldPerformance_problem.py

@@ -8,7 +8,7 @@
 import warnings
 from .ICAOAtmosphere import ICAOAtmosphere
 from .FluidProperties import FluidProperties
-from .utils import CaseInsensitiveDict, Error
+from ..utils import CaseInsensitiveDict, Error
 
 
 class FieldPerformanceProblem:

baseclasses/pyMission_problem.py → baseclasses/problems/pyMission_problem.py

@@ -10,7 +10,7 @@
 
 from .ICAOAtmosphere import ICAOAtmosphere
 from .FluidProperties import FluidProperties
-from .utils import Error
+from ..utils import Error
 
 
 class MissionProblem:

baseclasses/pyStruct_problem.py → baseclasses/problems/pyStruct_problem.py

@@ -6,7 +6,7 @@
 # Imports
 # =============================================================================
 import warnings
-from .utils import Error
+from ..utils import Error
 
 
 class StructProblem:

baseclasses/pyTransi_problem.py → baseclasses/problems/pyTransi_problem.py

@@ -2,7 +2,7 @@
 pyAero_problem
 
 """
-from .utils import Error
+from ..utils import Error
 
 
 class TransiProblem:

baseclasses/pyWeight_problem.py → baseclasses/problems/pyWeight_problem.py

@@ -11,7 +11,7 @@
     from pygeo import geo_utils
 except ImportError:
     geo_utils = None
-from .utils import Error
+from ..utils import Error
 
 
 class WeightProblem:

baseclasses/BaseSolver.py → baseclasses/solvers/BaseSolver.py

@@ -7,7 +7,7 @@
 from pprint import pprint
 import copy
 import warnings
-from .utils import CaseInsensitiveDict, CaseInsensitiveSet, Error
+from ..utils import CaseInsensitiveDict, CaseInsensitiveSet, Error
 
 # =============================================================================
 # BaseSolver Class

baseclasses/solvers/__init__.py

@@ -0,0 +1,2 @@
+from .BaseSolver import BaseSolver
+from .pyAero_solver import AeroSolver

baseclasses/pyAero_solver.py → baseclasses/solvers/pyAero_solver.py

@@ -13,7 +13,7 @@
 # Extension modules
 # =============================================================================
 from .BaseSolver import BaseSolver
-from .utils import CaseInsensitiveDict, Error
+from ..utils import CaseInsensitiveDict, Error
 
 # =============================================================================
 # AeroSolver Class

baseclasses/testing/__init__.py

@@ -0,0 +1,2 @@
+from .pyRegTest import BaseRegTest, getTol
+from .decorators import require_mpi

baseclasses/BaseRegTest.py → baseclasses/testing/pyRegTest.py

@@ -9,7 +9,7 @@
 import json
 from collections import deque
 from contextlib import contextmanager
-from .utils import CaseInsensitiveDict, CaseInsensitiveSet, Error
+from ..utils import CaseInsensitiveDict, CaseInsensitiveSet, Error
 
 
 def getTol(**kwargs):

baseclasses/utils/__init__.py

@@ -0,0 +1,3 @@
+from .containers import CaseInsensitiveSet, CaseInsensitiveDict
+from .error import Error
+from .py3Util import getPy3SafeString

baseclasses/utils.py → baseclasses/utils/containers.py

@@ -204,24 +204,3 @@ def issubset(self, other) -> bool:
 
     def __repr__(self):
         return pformat(self.data)
-
-
-class Error(Exception):
-    """
-    Format the error message in a box to make it clear this
-    was a explicitly raised exception.
-    """
-
-    def __init__(self, message):
-        self.message = message
-        msg = "\n+" + "-" * 78 + "+" + "\n" + "| Error: "
-        i = 8
-        for word in message.split():
-            if len(word) + i + 1 > 78:  # Finish line and start new one
-                msg += " " * (78 - i) + "|\n| " + word + " "
-                i = 1 + len(word) + 1
-            else:
-                msg += word + " "
-                i += len(word) + 1
-        msg += " " * (78 - i) + "|\n" + "+" + "-" * 78 + "+" + "\n"
-        super().__init__(msg)

baseclasses/utils/error.py

@@ -0,0 +1,19 @@
+class Error(Exception):
+    """
+    Format the error message in a box to make it clear this
+    was a explicitly raised exception.
+    """
+
+    def __init__(self, message):
+        self.message = message
+        msg = "\n+" + "-" * 78 + "+" + "\n" + "| Error: "
+        i = 8
+        for word in message.split():
+            if len(word) + i + 1 > 78:  # Finish line and start new one
+                msg += " " * (78 - i) + "|\n| " + word + " "
+                i = 1 + len(word) + 1
+            else:
+                msg += word + " "
+                i += len(word) + 1
+        msg += " " * (78 - i) + "|\n" + "+" + "-" * 78 + "+" + "\n"
+        super().__init__(msg)

tests/test_BaseRegTest.py

@@ -2,8 +2,8 @@
 import unittest
 import numpy as np
 from baseclasses import BaseRegTest
-from baseclasses.BaseRegTest import getTol
-from baseclasses.decorators import require_mpi
+from baseclasses.testing import getTol
+from baseclasses.testing.decorators import require_mpi
 from baseclasses.utils import CaseInsensitiveDict
 
 try:

tests/test_BaseSolver.py

@@ -1,7 +1,7 @@
 import unittest
 from baseclasses import BaseSolver
 from baseclasses.utils import Error
-from baseclasses.decorators import require_mpi
+from baseclasses.testing.decorators import require_mpi
 
 
 class SOLVER(BaseSolver):

tests/test_CaseInsensitve.py

@@ -3,7 +3,7 @@
 from pprint import pformat
 from baseclasses.utils import CaseInsensitiveDict, CaseInsensitiveSet
 from parameterized import parameterized
-from baseclasses.decorators import require_mpi
+from baseclasses.testing.decorators import require_mpi
 
 value1 = 123
 value2 = 321