Major clean up of source code and restructuring.

Examples/base/README.rst

@@ -3,4 +3,4 @@
 Subclassing Examples
 ------------------------
 
-This section gathers examples which correspond to subclassing the :class:`easyscience.Objects.Base.BaseObj`  class.
+This section gathers examples which correspond to subclassing the :class:`easyscience.base_classes.ObjBase`  class.

Examples/base/plot_baseclass1.py

@@ -1,8 +1,8 @@
 """
-Subclassing BaseObj - Simple Pendulum
+Subclassing ObjBase - Simple Pendulum
 =====================================
-This  example shows how to subclass :class:`easyscience.Objects.Base.BaseObj` with parameters from
-:class:`EasyScience.Objects.Base.Parameter`. For this example a simple pendulum will be modeled.
+This  example shows how to subclass :class:`easyscience.base_classes.ObjBase` with parameters from
+:class:`EasyScience.variable.Parameter`. For this example a simple pendulum will be modeled.
 
 .. math::
     y = A \sin (2 \pi f t + \phi )
@@ -17,8 +17,8 @@
 import matplotlib.pyplot as plt
 import numpy as np
 
-from easyscience.Objects.ObjectClasses import BaseObj
-from easyscience.Objects.ObjectClasses import Parameter
+from easyscience.base_classes import ObjBase
+from easyscience.variable import Parameter
 
 # %%
 # Subclassing
@@ -29,7 +29,7 @@
 # embedded rST text block:
 
 
-class Pendulum(BaseObj):
+class Pendulum(ObjBase):
     def __init__(self, A: Parameter, f: Parameter, p: Parameter):
         super(Pendulum, self).__init__('SimplePendulum', A=A, f=f, p=p)
 

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2024, Easyscience contributors (https://github.com/EasyScience)
+Copyright (c) 2025, Easyscience contributors (https://github.com/EasyScience)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

docs/src/conf.py

@@ -51,9 +51,7 @@
 
 intersphinx_mapping = {
     'python': ('https://docs.python.org/3', None),
-    'numpy': ('https://numpy.org/doc/stable/', None),
-    'pint': ('https://pint.readthedocs.io/en/stable/', None),
-    'xarray': ('https://xarray.pydata.org/en/stable/', None)
+    'numpy': ('https://numpy.org/doc/stable/', None)
 }
 
 # -- General configuration ---------------------------------------------------

docs/src/reference/base.rst

@@ -5,13 +5,13 @@ Parameters and Objects
 Descriptors
 ===========
 
-.. autoclass:: easyscience.Objects.Variable.Descriptor
+.. autoclass:: easyscience.variable.Descriptor
   :members:
 
 Parameters
 ==========
 
-.. autoclass:: easyscience.Objects.Variable.Parameter
+.. autoclass:: easyscience.variable.Parameter
   :members:
   :inherited-members:
 
@@ -22,30 +22,17 @@ Super Classes and Collections
 Super Classes
 =============
 
-.. autoclass:: easyscience.Objects.ObjectClasses.BasedBase
+.. autoclass:: easyscience.base_classes.BasedBase
   :members:
   :inherited-members:
 
-.. autoclass:: easyscience.Objects.ObjectClasses.BaseObj
+.. autoclass:: easyscience.base_classes.ObjBase
   :members: +_add_component
   :inherited-members:
 
 Collections
 ===========
 
-.. autoclass:: easyscience.Objects.Groups.BaseCollection
+.. autoclass:: easyscience.CollectionBase
   :members:
   :inherited-members:
-
-===============
-Data Containers
-===============
-
-.. autoclass:: easyscience.Datasets.xarray.EasyScienceDataarrayAccessor
-  :members:
-  :inherited-members:
-
-.. autoclass:: easyscience.Datasets.xarray.EasyScienceDatasetAccessor
-  :members:
-  :inherited-members:
-

examples_old/example4.py

@@ -11,7 +11,7 @@
 
 from easyscience import global_object
 from easyscience.fitting import Fitter
-from easyscience.Objects.core import ComponentSerializer
+from easyscience.Objects.component_serializer import ComponentSerializer
 from easyscience.Objects.ObjectClasses import BaseObj
 from easyscience.Objects.ObjectClasses import Parameter
 

examples_old/example5_broken.py

@@ -12,7 +12,7 @@
 from easyscience.fitting import Fitter
 from easyscience.Objects.Base import BaseObj
 from easyscience.Objects.Base import Parameter
-from easyscience.Objects.core import ComponentSerializer
+from easyscience.Objects.component_serializer import ComponentSerializer
 
 # from easyscience.Objects.Base import LoggedProperty
 from easyscience.Objects.Inferface import InterfaceFactoryTemplate

examples_old/example6_broken.py

@@ -12,7 +12,7 @@
 from easyscience.fitting import Fitter
 from easyscience.Objects.ObjectClasses import BaseObj
 from easyscience.Objects.Variable import Parameter
-from easyscience.Objects.core import ComponentSerializer
+from easyscience.Objects.component_serializer import ComponentSerializer
 from easyscience.Objects.Inferface import InterfaceFactoryTemplate
 
 # This is a much more complex case where we have calculators, interfaces, interface factory and an

pyproject.toml

@@ -35,8 +35,6 @@ dependencies = [
     "lmfit",
     "numpy",  
     "uncertainties",
-    "xarray",
-    "pint",  # Only to ensure that unit is reported as dimensionless rather than empty string
     "scipp"
 ]
 
@@ -75,6 +73,7 @@ packages = ["src"]
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/easyscience"]
+exclude = ["src/easyscience/legacy"]
 
 [tool.coverage.run]
 source = ["src/easyscience"]

resources/scripts/generate_html.py

@@ -1,5 +1,3 @@
-__author__ = 'github.com/wardsimon'
-__version__ = '0.0.1'
 
 import sys