diff --git a/pyproject.toml b/pyproject.toml index 922b1ae2..4643eb19 100644 --- a/pyproject.toml +++ b/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 ] diff --git a/src/easydiffraction/job/experiment/backgrounds/background.py b/src/easydiffraction/job/experiment/backgrounds/background.py index 9eda29db..935c390f 100644 --- a/src/easydiffraction/job/experiment/backgrounds/background.py +++ b/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): diff --git a/src/easydiffraction/job/experiment/backgrounds/point.py b/src/easydiffraction/job/experiment/backgrounds/point.py index 199f4ef9..f00c51a3 100644 --- a/src/easydiffraction/job/experiment/backgrounds/point.py +++ b/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 diff --git a/src/easydiffraction/job/experiment/experiment.py b/src/easydiffraction/job/experiment/experiment.py index cec7787b..a6b47c62 100644 --- a/src/easydiffraction/job/experiment/experiment.py +++ b/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 diff --git a/src/easydiffraction/job/experiment/pd_1d.py b/src/easydiffraction/job/experiment/pd_1d.py index 5bc5c4ca..ab2608ca 100644 --- a/src/easydiffraction/job/experiment/pd_1d.py +++ b/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 diff --git a/src/easydiffraction/job/experiment/polarization.py b/src/easydiffraction/job/experiment/polarization.py index 24bfcd2b..ce9b5360 100644 --- a/src/easydiffraction/job/experiment/polarization.py +++ b/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 diff --git a/src/easydiffraction/job/model/site.py b/src/easydiffraction/job/model/site.py index 7bc3627e..ac167101 100644 --- a/src/easydiffraction/job/model/site.py +++ b/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