changes after merging DescriptorAny in EasyCrystallography

pyproject.toml

@@ -27,7 +27,7 @@ requires-python = '>=3.9,<3.13'
 dependencies = [
   'cryspy',                                                                                     # Calculations of diffraction patterns
   'easycrystallography @ git+https://github.com/EasyScience/EasyCrystallography.git@new_param', # Crystallography tools of the EasyScience framework
-  'easyscience',                                                                                # The base library of the EasyScience framework
+  'easyscience @ git+https://github.com/EasyScience/EasyScience.git@new_param_fix',             # The base library of the EasyScience framework
   'pooch',                                                                                      # For data fetching
 ]
 

src/easydiffraction/job/experiment/backgrounds/background.py

@@ -8,7 +8,7 @@
 
 import numpy as np
 from easyscience.Objects.Groups import BaseCollection
-from easyscience.Objects.new_variable import DescriptorStr as Descriptor
+from easyscience.Objects.variable import DescriptorStr as Descriptor
 
 
 class Background(BaseCollection):

src/easydiffraction/job/experiment/backgrounds/point.py

@@ -7,9 +7,9 @@
 
 import numpy as np
 from easyscience.Objects.Groups import BaseCollection
-from easyscience.Objects.new_variable import DescriptorNumber as Descriptor
-from easyscience.Objects.new_variable import Parameter
 from easyscience.Objects.ObjectClasses import BaseObj
+from easyscience.Objects.variable import DescriptorNumber as Descriptor
+from easyscience.Objects.variable import Parameter
 
 from .background import Background
 

src/easydiffraction/job/experiment/experiment.py

@@ -5,8 +5,8 @@
 import numpy as np
 from easyscience.Datasets.xarray import xr
 from easyscience.Objects.job.experiment import ExperimentBase as coreExperiment
-from easyscience.Objects.new_variable import DescriptorNumber as Descriptor
-from easyscience.Objects.new_variable import Parameter
+from easyscience.Objects.variable import DescriptorNumber as Descriptor
+from easyscience.Objects.variable import Parameter
 from gemmi import cif
 
 from easydiffraction.io.cif_reader import background_from_cif_block as background_from_cif

src/easydiffraction/job/experiment/pd_1d.py

@@ -13,9 +13,9 @@
 from typing import Union
 
 from easyscience.Datasets.xarray import xr
-from easyscience.Objects.new_variable import DescriptorStr as Descriptor
-from easyscience.Objects.new_variable import Parameter
 from easyscience.Objects.ObjectClasses import BaseObj
+from easyscience.Objects.variable import DescriptorStr as Descriptor
+from easyscience.Objects.variable import Parameter
 
 from easydiffraction.job.experiment.backgrounds.background import BackgroundContainer
 from easydiffraction.job.experiment.common import JobSetup

src/easydiffraction/job/experiment/polarization.py

@@ -9,8 +9,8 @@
 from typing import Optional
 from typing import Union
 
-from easyscience.Objects.new_variable import Parameter
 from easyscience.Objects.ObjectClasses import BaseObj
+from easyscience.Objects.variable import Parameter
 
 if TYPE_CHECKING:
     from easyscience.Objects.Inferface import iF

src/easydiffraction/job/model/site.py

@@ -15,8 +15,8 @@
 from easycrystallography.Components.Specie import Specie
 from easycrystallography.Components.Susceptibility import MagneticSusceptibility
 from easycrystallography.io.star_base import StarLoop
-from easyscience.Objects.new_variable import DescriptorStr as Descriptor
-from easyscience.Objects.new_variable import Parameter
+from easyscience.Objects.variable import DescriptorStr as Descriptor
+from easyscience.Objects.variable import Parameter
 
 if TYPE_CHECKING:
     from easyscience.Objects.Inferface import iF