From 2af23f89c46fa209f95b92474841fcd4a162c5bb Mon Sep 17 00:00:00 2001 From: sdRDM Bot Date: Thu, 16 May 2024 06:58:44 +0000 Subject: [PATCH] API update --- pyThermoML/__init__.py | 2 +- .../core/activityfugacityosmoticprop.py | 6 +- pyThermoML/core/asymcombexpanduncert.py | 2 +- pyThermoML/core/asymcombstduncert.py | 2 +- pyThermoML/core/asymexpanduncert.py | 2 +- pyThermoML/core/asymstduncert.py | 2 +- pyThermoML/core/auxiliarysubstance.py | 4 +- pyThermoML/core/biomaterial.py | 2 +- pyThermoML/core/bioproperties.py | 6 +- pyThermoML/core/book.py | 2 +- pyThermoML/core/catalyst.py | 2 +- pyThermoML/core/citation.py | 8 +- pyThermoML/core/combineduncertainty.py | 4 +- pyThermoML/core/component.py | 2 +- pyThermoML/core/componentsample.py | 2 +- .../core/compositionatphaseequilibrium.py | 6 +- pyThermoML/core/compound.py | 16 ++-- pyThermoML/core/constraint.py | 8 +- pyThermoML/core/constraintid.py | 2 +- pyThermoML/core/constraintphaseid.py | 4 +- pyThermoML/core/constrainttype.py | 8 +- pyThermoML/core/constrdevicespec.py | 2 +- pyThermoML/core/constrrepeatability.py | 2 +- pyThermoML/core/construncertainty.py | 2 +- pyThermoML/core/covariance.py | 2 +- pyThermoML/core/criticalevaluation.py | 2 +- pyThermoML/core/criticals.py | 6 +- pyThermoML/core/curvedev.py | 2 +- pyThermoML/core/datareport.py | 46 ++++++------ pyThermoML/core/eqconstant.py | 2 +- pyThermoML/core/eqconstraint.py | 2 +- pyThermoML/core/eqparameter.py | 2 +- pyThermoML/core/eqproperty.py | 2 +- pyThermoML/core/equation.py | 8 +- pyThermoML/core/equationofstate.py | 8 +- pyThermoML/core/eqvariable.py | 2 +- pyThermoML/core/evaleosref.py | 8 +- pyThermoML/core/evalmultipropref.py | 8 +- pyThermoML/core/evalsinglepropref.py | 8 +- .../core/excesspartialapparentenergyprop.py | 6 +- pyThermoML/core/heatcapacityandderivedprop.py | 6 +- pyThermoML/core/ion.py | 2 +- pyThermoML/core/journal.py | 2 +- pyThermoML/core/multicomponentsubstance.py | 4 +- pyThermoML/core/multiprop.py | 10 +-- pyThermoML/core/numvalues.py | 14 ++-- pyThermoML/core/participant.py | 6 +- pyThermoML/core/phaseid.py | 4 +- pyThermoML/core/phasetransition.py | 6 +- pyThermoML/core/polymer.py | 2 +- pyThermoML/core/prediction.py | 12 +-- pyThermoML/core/predictionmethodref.py | 8 +- pyThermoML/core/propdevicespec.py | 2 +- pyThermoML/core/property.py | 38 +++++----- pyThermoML/core/propertygroup.py | 18 ++--- pyThermoML/core/propertymethodid.py | 2 +- pyThermoML/core/propertyvalue.py | 14 ++-- pyThermoML/core/proplimit.py | 2 +- pyThermoML/core/propphaseid.py | 6 +- pyThermoML/core/proprepeatability.py | 2 +- pyThermoML/core/propuncertainty.py | 4 +- pyThermoML/core/pureormixturedata.py | 70 +++++++++--------- pyThermoML/core/purity.py | 2 +- pyThermoML/core/reactiondata.py | 74 +++++++++---------- pyThermoML/core/reactionequilibriumprop.py | 6 +- pyThermoML/core/reactionstatechangeprop.py | 6 +- pyThermoML/core/refphaseid.py | 4 +- .../refractionsurfacetensionsoundspeed.py | 6 +- pyThermoML/core/regnum.py | 2 +- pyThermoML/core/sample.py | 6 +- pyThermoML/core/singleprop.py | 10 +-- pyThermoML/core/solvent.py | 2 +- pyThermoML/core/sorgid.py | 2 +- pyThermoML/core/thesis.py | 2 +- pyThermoML/core/transportprop.py | 6 +- pyThermoML/core/trcrefid.py | 2 +- .../core/vaporpboilingtazeotroptandp.py | 6 +- pyThermoML/core/vardevicespec.py | 2 +- pyThermoML/core/variable.py | 10 +-- pyThermoML/core/variableid.py | 4 +- pyThermoML/core/variabletype.py | 8 +- pyThermoML/core/variablevalue.py | 4 +- pyThermoML/core/varphaseid.py | 6 +- pyThermoML/core/varrepeatability.py | 2 +- pyThermoML/core/varuncertainty.py | 2 +- pyThermoML/core/version.py | 2 +- pyThermoML/core/volumetricprop.py | 6 +- 87 files changed, 314 insertions(+), 314 deletions(-) diff --git a/pyThermoML/__init__.py b/pyThermoML/__init__.py index 890adda..104713b 100644 --- a/pyThermoML/__init__.py +++ b/pyThermoML/__init__.py @@ -1,3 +1,3 @@ __URL__ = "https://github.com/FAIRChemistry/pyThermoML" -__COMMIT__ = "4d2d23abb157f43b563c9d44de5b83e37a50b96b" +__COMMIT__ = "decc3d7428f0517c8bc0428fd9785112138a62f6" diff --git a/pyThermoML/core/activityfugacityosmoticprop.py b/pyThermoML/core/activityfugacityosmoticprop.py index 602525d..44008b8 100644 --- a/pyThermoML/core/activityfugacityosmoticprop.py +++ b/pyThermoML/core/activityfugacityosmoticprop.py @@ -7,9 +7,9 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .epropname import ePropName -from .criticalevaluation import CriticalEvaluation from .prediction import Prediction +from .criticalevaluation import CriticalEvaluation +from .epropname import ePropName from .emethodname import eMethodName @@ -47,7 +47,7 @@ class ActivityFugacityOsmoticProp( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/asymcombexpanduncert.py b/pyThermoML/core/asymcombexpanduncert.py index e6af84c..69dc042 100644 --- a/pyThermoML/core/asymcombexpanduncert.py +++ b/pyThermoML/core/asymcombexpanduncert.py @@ -30,7 +30,7 @@ class AsymCombExpandUncert( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/asymcombstduncert.py b/pyThermoML/core/asymcombstduncert.py index 18d0904..e20d768 100644 --- a/pyThermoML/core/asymcombstduncert.py +++ b/pyThermoML/core/asymcombstduncert.py @@ -30,7 +30,7 @@ class AsymCombStdUncert( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/asymexpanduncert.py b/pyThermoML/core/asymexpanduncert.py index 9121c59..ed27c5e 100644 --- a/pyThermoML/core/asymexpanduncert.py +++ b/pyThermoML/core/asymexpanduncert.py @@ -30,7 +30,7 @@ class AsymExpandUncert( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/asymstduncert.py b/pyThermoML/core/asymstduncert.py index 919d81d..bf6f4e8 100644 --- a/pyThermoML/core/asymstduncert.py +++ b/pyThermoML/core/asymstduncert.py @@ -30,7 +30,7 @@ class AsymStdUncert( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/auxiliarysubstance.py b/pyThermoML/core/auxiliarysubstance.py index da325a8..6b5c3f6 100644 --- a/pyThermoML/core/auxiliarysubstance.py +++ b/pyThermoML/core/auxiliarysubstance.py @@ -7,9 +7,9 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict +from .efunction import eFunction from .ephase import ePhase from .regnum import RegNum -from .efunction import eFunction @forge_signature @@ -45,7 +45,7 @@ class AuxiliarySubstance( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/biomaterial.py b/pyThermoML/core/biomaterial.py index a4219e5..5a21b48 100644 --- a/pyThermoML/core/biomaterial.py +++ b/pyThermoML/core/biomaterial.py @@ -30,7 +30,7 @@ class Biomaterial( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/bioproperties.py b/pyThermoML/core/bioproperties.py index fca5b7f..1f55aaa 100644 --- a/pyThermoML/core/bioproperties.py +++ b/pyThermoML/core/bioproperties.py @@ -7,9 +7,9 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .epropname import ePropName -from .criticalevaluation import CriticalEvaluation from .prediction import Prediction +from .criticalevaluation import CriticalEvaluation +from .epropname import ePropName from .emethodname import eMethodName @@ -47,7 +47,7 @@ class BioProperties( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/book.py b/pyThermoML/core/book.py index bbd6cab..ed5b351 100644 --- a/pyThermoML/core/book.py +++ b/pyThermoML/core/book.py @@ -58,7 +58,7 @@ class Book( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/catalyst.py b/pyThermoML/core/catalyst.py index e29007d..a51bd31 100644 --- a/pyThermoML/core/catalyst.py +++ b/pyThermoML/core/catalyst.py @@ -35,7 +35,7 @@ class Catalyst( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/citation.py b/pyThermoML/core/citation.py index df3df20..74f7a6a 100644 --- a/pyThermoML/core/citation.py +++ b/pyThermoML/core/citation.py @@ -7,12 +7,12 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .trcrefid import TRCRefID from .etype import eType +from .elanguage import eLanguage from .thesis import Thesis -from .book import Book from .esourcetype import eSourceType -from .elanguage import eLanguage +from .trcrefid import TRCRefID +from .book import Book from .journal import Journal @@ -167,7 +167,7 @@ class Citation( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/combineduncertainty.py b/pyThermoML/core/combineduncertainty.py index dae4f51..b51f685 100644 --- a/pyThermoML/core/combineduncertainty.py +++ b/pyThermoML/core/combineduncertainty.py @@ -7,8 +7,8 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .asymcombexpanduncert import AsymCombExpandUncert from .asymcombstduncert import AsymCombStdUncert +from .asymcombexpanduncert import AsymCombExpandUncert from .ecombuncertevalmethod import eCombUncertEvalMethod @@ -77,7 +77,7 @@ class CombinedUncertainty( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/component.py b/pyThermoML/core/component.py index 02bb1d9..13a03fa 100644 --- a/pyThermoML/core/component.py +++ b/pyThermoML/core/component.py @@ -37,7 +37,7 @@ class Component( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/componentsample.py b/pyThermoML/core/componentsample.py index bf2898f..585fb42 100644 --- a/pyThermoML/core/componentsample.py +++ b/pyThermoML/core/componentsample.py @@ -34,7 +34,7 @@ class ComponentSample( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/compositionatphaseequilibrium.py b/pyThermoML/core/compositionatphaseequilibrium.py index fcd4a68..15d1d55 100644 --- a/pyThermoML/core/compositionatphaseequilibrium.py +++ b/pyThermoML/core/compositionatphaseequilibrium.py @@ -7,9 +7,9 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .epropname import ePropName -from .criticalevaluation import CriticalEvaluation from .prediction import Prediction +from .criticalevaluation import CriticalEvaluation +from .epropname import ePropName from .emethodname import eMethodName @@ -47,7 +47,7 @@ class CompositionAtPhaseEquilibrium( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/compound.py b/pyThermoML/core/compound.py index fa0cefe..9e8daf1 100644 --- a/pyThermoML/core/compound.py +++ b/pyThermoML/core/compound.py @@ -7,18 +7,18 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .sorgid import SOrgID -from .multicomponentsubstance import MulticomponentSubstance -from .ion import Ion -from .sample import Sample -from .purity import Purity from .esource import eSource +from .purity import Purity from .estatus import eStatus -from .polymer import Polymer +from .sorgid import SOrgID +from .sample import Sample from .regnum import RegNum -from .biomaterial import Biomaterial from .especiationstate import eSpeciationState from .componentsample import ComponentSample +from .ion import Ion +from .polymer import Polymer +from .multicomponentsubstance import MulticomponentSubstance +from .biomaterial import Biomaterial @forge_signature @@ -128,7 +128,7 @@ class Compound( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/constraint.py b/pyThermoML/core/constraint.py index 91359c7..1d907f7 100644 --- a/pyThermoML/core/constraint.py +++ b/pyThermoML/core/constraint.py @@ -7,12 +7,12 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .constrdevicespec import ConstrDeviceSpec -from .constraintid import ConstraintID -from .solvent import Solvent from .constrrepeatability import ConstrRepeatability +from .constraintid import ConstraintID from .constraintphaseid import ConstraintPhaseID from .construncertainty import ConstrUncertainty +from .constrdevicespec import ConstrDeviceSpec +from .solvent import Solvent @forge_signature @@ -74,7 +74,7 @@ class Constraint( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/constraintid.py b/pyThermoML/core/constraintid.py index 900df2c..6a963e0 100644 --- a/pyThermoML/core/constraintid.py +++ b/pyThermoML/core/constraintid.py @@ -37,7 +37,7 @@ class ConstraintID( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/constraintphaseid.py b/pyThermoML/core/constraintphaseid.py index 72353c1..4e3af9e 100644 --- a/pyThermoML/core/constraintphaseid.py +++ b/pyThermoML/core/constraintphaseid.py @@ -7,9 +7,9 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .ecrystallatticetype import eCrystalLatticeType from .econstraintphase import eConstraintPhase from .regnum import RegNum +from .ecrystallatticetype import eCrystalLatticeType @forge_signature @@ -48,7 +48,7 @@ class ConstraintPhaseID( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/constrainttype.py b/pyThermoML/core/constrainttype.py index d732792..251cfaa 100644 --- a/pyThermoML/core/constrainttype.py +++ b/pyThermoML/core/constrainttype.py @@ -7,13 +7,13 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .ecomponentcomposition import eComponentComposition from .etemperature import eTemperature -from .ebiovariables import eBioVariables +from .esolventcomposition import eSolventComposition from .eparticipantamount import eParticipantAmount from .emiscellaneous import eMiscellaneous +from .ecomponentcomposition import eComponentComposition +from .ebiovariables import eBioVariables from .epressure import ePressure -from .esolventcomposition import eSolventComposition @forge_signature @@ -58,7 +58,7 @@ class ConstraintType( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/constrdevicespec.py b/pyThermoML/core/constrdevicespec.py index 39beda6..05a36a6 100644 --- a/pyThermoML/core/constrdevicespec.py +++ b/pyThermoML/core/constrdevicespec.py @@ -50,7 +50,7 @@ class ConstrDeviceSpec( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/constrrepeatability.py b/pyThermoML/core/constrrepeatability.py index 9391f31..cdc4b0e 100644 --- a/pyThermoML/core/constrrepeatability.py +++ b/pyThermoML/core/constrrepeatability.py @@ -42,7 +42,7 @@ class ConstrRepeatability( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/construncertainty.py b/pyThermoML/core/construncertainty.py index e16d7ab..d20282f 100644 --- a/pyThermoML/core/construncertainty.py +++ b/pyThermoML/core/construncertainty.py @@ -54,7 +54,7 @@ class ConstrUncertainty( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/covariance.py b/pyThermoML/core/covariance.py index ec248f8..4ce1f4c 100644 --- a/pyThermoML/core/covariance.py +++ b/pyThermoML/core/covariance.py @@ -35,7 +35,7 @@ class Covariance( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/criticalevaluation.py b/pyThermoML/core/criticalevaluation.py index d250173..44d055e 100644 --- a/pyThermoML/core/criticalevaluation.py +++ b/pyThermoML/core/criticalevaluation.py @@ -42,7 +42,7 @@ class CriticalEvaluation( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/criticals.py b/pyThermoML/core/criticals.py index ba16ef7..04e66cf 100644 --- a/pyThermoML/core/criticals.py +++ b/pyThermoML/core/criticals.py @@ -7,9 +7,9 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .epropname import ePropName -from .criticalevaluation import CriticalEvaluation from .prediction import Prediction +from .criticalevaluation import CriticalEvaluation +from .epropname import ePropName from .emethodname import eMethodName @@ -47,7 +47,7 @@ class Criticals( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/curvedev.py b/pyThermoML/core/curvedev.py index 3915fae..56fabdb 100644 --- a/pyThermoML/core/curvedev.py +++ b/pyThermoML/core/curvedev.py @@ -50,7 +50,7 @@ class CurveDev( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/datareport.py b/pyThermoML/core/datareport.py index 8853ef5..70c43ce 100644 --- a/pyThermoML/core/datareport.py +++ b/pyThermoML/core/datareport.py @@ -10,35 +10,35 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict +from .polymer import Polymer +from .participant import Participant from .sorgid import SOrgID -from .property import Property -from .propphaseid import PropPhaseID from .reactiondata import ReactionData -from .pureormixturedata import PureOrMixtureData -from .compound import Compound -from .variable import Variable -from .ion import Ion -from .equation import Equation -from .auxiliarysubstance import AuxiliarySubstance +from .property import Property +from .regnum import RegNum +from .combineduncertainty import CombinedUncertainty +from .ereactionformalism import eReactionFormalism +from .version import Version from .multicomponentsubstance import MulticomponentSubstance -from .participant import Participant -from .propertymethodid import PropertyMethodID -from .eexppurpose import eExpPurpose -from .component import Component -from .ereactiontype import eReactionType -from .solvent import Solvent -from .citation import Citation from .numvalues import NumValues -from .especiationstate import eSpeciationState -from .ereactionformalism import eReactionFormalism from .sample import Sample -from .version import Version -from .combineduncertainty import CombinedUncertainty -from .biomaterial import Biomaterial +from .especiationstate import eSpeciationState +from .solvent import Solvent +from .eexppurpose import eExpPurpose +from .equation import Equation from .constraint import Constraint -from .polymer import Polymer -from .regnum import RegNum +from .biomaterial import Biomaterial +from .citation import Citation from .phaseid import PhaseID +from .variable import Variable +from .auxiliarysubstance import AuxiliarySubstance +from .pureormixturedata import PureOrMixtureData +from .compound import Compound +from .propertymethodid import PropertyMethodID +from .component import Component +from .propphaseid import PropPhaseID +from .ion import Ion +from .ereactiontype import eReactionType from ..tools.mapping import ( CONTSTRAINT_IDS, VARIABLES_IDS, @@ -87,7 +87,7 @@ class DataReport( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/eqconstant.py b/pyThermoML/core/eqconstant.py index 926c035..e80a297 100644 --- a/pyThermoML/core/eqconstant.py +++ b/pyThermoML/core/eqconstant.py @@ -44,7 +44,7 @@ class EqConstant( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/eqconstraint.py b/pyThermoML/core/eqconstraint.py index 929d220..591fb4d 100644 --- a/pyThermoML/core/eqconstraint.py +++ b/pyThermoML/core/eqconstraint.py @@ -62,7 +62,7 @@ class EqConstraint( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/eqparameter.py b/pyThermoML/core/eqparameter.py index 6df0719..8693e68 100644 --- a/pyThermoML/core/eqparameter.py +++ b/pyThermoML/core/eqparameter.py @@ -41,7 +41,7 @@ class EqParameter( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/eqproperty.py b/pyThermoML/core/eqproperty.py index 9beccee..70dc232 100644 --- a/pyThermoML/core/eqproperty.py +++ b/pyThermoML/core/eqproperty.py @@ -58,7 +58,7 @@ class EqProperty( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/equation.py b/pyThermoML/core/equation.py index 6123d3d..cc595a0 100644 --- a/pyThermoML/core/equation.py +++ b/pyThermoML/core/equation.py @@ -8,12 +8,12 @@ from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict from .eqparameter import EqParameter +from .eqvariable import EqVariable from .eqconstant import EqConstant -from .eqconstraint import EqConstraint from .eqproperty import EqProperty -from .eeqname import eEqName +from .eqconstraint import EqConstraint from .covariance import Covariance -from .eqvariable import EqVariable +from .eeqname import eEqName @forge_signature @@ -75,7 +75,7 @@ class Equation( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/equationofstate.py b/pyThermoML/core/equationofstate.py index 445b770..8ba227e 100644 --- a/pyThermoML/core/equationofstate.py +++ b/pyThermoML/core/equationofstate.py @@ -7,13 +7,13 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .trcrefid import TRCRefID from .etype import eType +from .elanguage import eLanguage from .thesis import Thesis -from .book import Book from .esourcetype import eSourceType -from .elanguage import eLanguage +from .trcrefid import TRCRefID from .evaleosref import EvalEOSRef +from .book import Book from .journal import Journal @@ -45,7 +45,7 @@ class EquationOfState( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/eqvariable.py b/pyThermoML/core/eqvariable.py index bc4a974..4d8f9ec 100644 --- a/pyThermoML/core/eqvariable.py +++ b/pyThermoML/core/eqvariable.py @@ -54,7 +54,7 @@ class EqVariable( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/evaleosref.py b/pyThermoML/core/evaleosref.py index 362d64d..3fef0ba 100644 --- a/pyThermoML/core/evaleosref.py +++ b/pyThermoML/core/evaleosref.py @@ -7,12 +7,12 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .trcrefid import TRCRefID from .etype import eType +from .elanguage import eLanguage from .thesis import Thesis -from .book import Book from .esourcetype import eSourceType -from .elanguage import eLanguage +from .trcrefid import TRCRefID +from .book import Book from .journal import Journal @@ -167,7 +167,7 @@ class EvalEOSRef( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/evalmultipropref.py b/pyThermoML/core/evalmultipropref.py index caba26f..fc104b6 100644 --- a/pyThermoML/core/evalmultipropref.py +++ b/pyThermoML/core/evalmultipropref.py @@ -7,12 +7,12 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .trcrefid import TRCRefID from .etype import eType +from .elanguage import eLanguage from .thesis import Thesis -from .book import Book from .esourcetype import eSourceType -from .elanguage import eLanguage +from .trcrefid import TRCRefID +from .book import Book from .journal import Journal @@ -167,7 +167,7 @@ class EvalMultiPropRef( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/evalsinglepropref.py b/pyThermoML/core/evalsinglepropref.py index bdc0899..9d601aa 100644 --- a/pyThermoML/core/evalsinglepropref.py +++ b/pyThermoML/core/evalsinglepropref.py @@ -7,12 +7,12 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .trcrefid import TRCRefID from .etype import eType +from .elanguage import eLanguage from .thesis import Thesis -from .book import Book from .esourcetype import eSourceType -from .elanguage import eLanguage +from .trcrefid import TRCRefID +from .book import Book from .journal import Journal @@ -167,7 +167,7 @@ class EvalSinglePropRef( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/excesspartialapparentenergyprop.py b/pyThermoML/core/excesspartialapparentenergyprop.py index 8c6dd21..a44fe22 100644 --- a/pyThermoML/core/excesspartialapparentenergyprop.py +++ b/pyThermoML/core/excesspartialapparentenergyprop.py @@ -7,9 +7,9 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .epropname import ePropName -from .criticalevaluation import CriticalEvaluation from .prediction import Prediction +from .criticalevaluation import CriticalEvaluation +from .epropname import ePropName from .emethodname import eMethodName @@ -47,7 +47,7 @@ class ExcessPartialApparentEnergyProp( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/heatcapacityandderivedprop.py b/pyThermoML/core/heatcapacityandderivedprop.py index f16aaff..0eb3430 100644 --- a/pyThermoML/core/heatcapacityandderivedprop.py +++ b/pyThermoML/core/heatcapacityandderivedprop.py @@ -7,9 +7,9 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .epropname import ePropName -from .criticalevaluation import CriticalEvaluation from .prediction import Prediction +from .criticalevaluation import CriticalEvaluation +from .epropname import ePropName from .emethodname import eMethodName @@ -47,7 +47,7 @@ class HeatCapacityAndDerivedProp( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/ion.py b/pyThermoML/core/ion.py index 6239abc..b7b2964 100644 --- a/pyThermoML/core/ion.py +++ b/pyThermoML/core/ion.py @@ -27,7 +27,7 @@ class Ion( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/journal.py b/pyThermoML/core/journal.py index 880b668..1709e39 100644 --- a/pyThermoML/core/journal.py +++ b/pyThermoML/core/journal.py @@ -44,7 +44,7 @@ class Journal( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/multicomponentsubstance.py b/pyThermoML/core/multicomponentsubstance.py index f6bfafb..17e7f5d 100644 --- a/pyThermoML/core/multicomponentsubstance.py +++ b/pyThermoML/core/multicomponentsubstance.py @@ -7,8 +7,8 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .component import Component from .regnum import RegNum +from .component import Component @forge_signature @@ -39,7 +39,7 @@ class MulticomponentSubstance( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/multiprop.py b/pyThermoML/core/multiprop.py index 123472d..0aae5e5 100644 --- a/pyThermoML/core/multiprop.py +++ b/pyThermoML/core/multiprop.py @@ -7,13 +7,13 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .trcrefid import TRCRefID from .etype import eType +from .evalmultipropref import EvalMultiPropRef +from .elanguage import eLanguage from .thesis import Thesis -from .book import Book from .esourcetype import eSourceType -from .elanguage import eLanguage -from .evalmultipropref import EvalMultiPropRef +from .trcrefid import TRCRefID +from .book import Book from .journal import Journal @@ -47,7 +47,7 @@ class MultiProp( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/numvalues.py b/pyThermoML/core/numvalues.py index f87ba28..0e5749a 100644 --- a/pyThermoML/core/numvalues.py +++ b/pyThermoML/core/numvalues.py @@ -7,15 +7,15 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .varrepeatability import VarRepeatability -from .propuncertainty import PropUncertainty -from .combineduncertainty import CombinedUncertainty from .curvedev import CurveDev -from .proplimit import PropLimit -from .varuncertainty import VarUncertainty +from .variablevalue import VariableValue +from .combineduncertainty import CombinedUncertainty from .proprepeatability import PropRepeatability from .propertyvalue import PropertyValue -from .variablevalue import VariableValue +from .propuncertainty import PropUncertainty +from .varrepeatability import VarRepeatability +from .varuncertainty import VarUncertainty +from .proplimit import PropLimit @forge_signature @@ -43,7 +43,7 @@ class NumValues( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/participant.py b/pyThermoML/core/participant.py index aba4e91..3bf20cc 100644 --- a/pyThermoML/core/participant.py +++ b/pyThermoML/core/participant.py @@ -7,11 +7,11 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .ecrystallatticetype import eCrystalLatticeType from .ephase import ePhase +from .estandardstate import eStandardState from .ecompositionrepresentation import eCompositionRepresentation from .regnum import RegNum -from .estandardstate import eStandardState +from .ecrystallatticetype import eCrystalLatticeType @forge_signature @@ -71,7 +71,7 @@ class Participant( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/phaseid.py b/pyThermoML/core/phaseid.py index 0fdb0a3..2bc4c29 100644 --- a/pyThermoML/core/phaseid.py +++ b/pyThermoML/core/phaseid.py @@ -7,9 +7,9 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .ecrystallatticetype import eCrystalLatticeType from .ephase import ePhase from .regnum import RegNum +from .ecrystallatticetype import eCrystalLatticeType @forge_signature @@ -46,7 +46,7 @@ class PhaseID( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/phasetransition.py b/pyThermoML/core/phasetransition.py index 86783d0..ac5d19e 100644 --- a/pyThermoML/core/phasetransition.py +++ b/pyThermoML/core/phasetransition.py @@ -7,9 +7,9 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .epropname import ePropName -from .criticalevaluation import CriticalEvaluation from .prediction import Prediction +from .criticalevaluation import CriticalEvaluation +from .epropname import ePropName from .emethodname import eMethodName @@ -47,7 +47,7 @@ class PhaseTransition( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/polymer.py b/pyThermoML/core/polymer.py index 6bead24..f7a1aba 100644 --- a/pyThermoML/core/polymer.py +++ b/pyThermoML/core/polymer.py @@ -69,7 +69,7 @@ class Polymer( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/prediction.py b/pyThermoML/core/prediction.py index b8aa34f..20ddfce 100644 --- a/pyThermoML/core/prediction.py +++ b/pyThermoML/core/prediction.py @@ -7,15 +7,15 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .trcrefid import TRCRefID -from .epredictiontype import ePredictionType from .etype import eType -from .thesis import Thesis +from .elanguage import eLanguage from .predictionmethodref import PredictionMethodRef -from .book import Book +from .thesis import Thesis from .esourcetype import eSourceType -from .elanguage import eLanguage +from .trcrefid import TRCRefID +from .book import Book from .journal import Journal +from .epredictiontype import ePredictionType @forge_signature @@ -53,7 +53,7 @@ class Prediction( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/predictionmethodref.py b/pyThermoML/core/predictionmethodref.py index 8939f25..9700f6e 100644 --- a/pyThermoML/core/predictionmethodref.py +++ b/pyThermoML/core/predictionmethodref.py @@ -7,12 +7,12 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .trcrefid import TRCRefID from .etype import eType +from .elanguage import eLanguage from .thesis import Thesis -from .book import Book from .esourcetype import eSourceType -from .elanguage import eLanguage +from .trcrefid import TRCRefID +from .book import Book from .journal import Journal @@ -167,7 +167,7 @@ class PredictionMethodRef( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/propdevicespec.py b/pyThermoML/core/propdevicespec.py index 08041ce..6343c04 100644 --- a/pyThermoML/core/propdevicespec.py +++ b/pyThermoML/core/propdevicespec.py @@ -45,7 +45,7 @@ class PropDeviceSpec( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/property.py b/pyThermoML/core/property.py index 5bfc388..23c0b7b 100644 --- a/pyThermoML/core/property.py +++ b/pyThermoML/core/property.py @@ -7,29 +7,29 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .ebiostate import eBioState -from .catalyst import Catalyst -from .regnum import RegNum -from .epropphase import ePropPhase -from .proprepeatability import PropRepeatability -from .ecombuncertevalmethod import eCombUncertEvalMethod -from .propuncertainty import PropUncertainty -from .asymstduncert import AsymStdUncert -from .solvent import Solvent -from .propphaseid import PropPhaseID +from .asymcombexpanduncert import AsymCombExpandUncert +from .ecrystallatticetype import eCrystalLatticeType from .refphaseid import RefPhaseID -from .asymexpanduncert import AsymExpandUncert -from .combineduncertainty import CombinedUncertainty -from .propertymethodid import PropertyMethodID -from .estandardstate import eStandardState from .epresentation import ePresentation -from .asymcombexpanduncert import AsymCombExpandUncert +from .ecombuncertevalmethod import eCombUncertEvalMethod +from .propertymethodid import PropertyMethodID from .curvedev import CurveDev -from .ephase import ePhase -from .ecrystallatticetype import eCrystalLatticeType +from .combineduncertainty import CombinedUncertainty from .asymcombstduncert import AsymCombStdUncert -from .propdevicespec import PropDeviceSpec +from .estandardstate import eStandardState +from .propuncertainty import PropUncertainty from .erefstatetype import eRefStateType +from .epropphase import ePropPhase +from .catalyst import Catalyst +from .propdevicespec import PropDeviceSpec +from .ephase import ePhase +from .proprepeatability import PropRepeatability +from .propphaseid import PropPhaseID +from .asymstduncert import AsymStdUncert +from .ebiostate import eBioState +from .regnum import RegNum +from .asymexpanduncert import AsymExpandUncert +from .solvent import Solvent @forge_signature @@ -143,7 +143,7 @@ class Property( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/propertygroup.py b/pyThermoML/core/propertygroup.py index 57b8126..0b8772f 100644 --- a/pyThermoML/core/propertygroup.py +++ b/pyThermoML/core/propertygroup.py @@ -7,19 +7,19 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict +from .vaporpboilingtazeotroptandp import VaporPBoilingTAzeotropTandP +from .reactionequilibriumprop import ReactionEquilibriumProp +from .excesspartialapparentenergyprop import ExcessPartialApparentEnergyProp from .bioproperties import BioProperties -from .activityfugacityosmoticprop import ActivityFugacityOsmoticProp +from .heatcapacityandderivedprop import HeatCapacityAndDerivedProp +from .transportprop import TransportProp from .phasetransition import PhaseTransition -from .refractionsurfacetensionsoundspeed import RefractionSurfaceTensionSoundSpeed -from .volumetricprop import VolumetricProp from .criticals import Criticals -from .excesspartialapparentenergyprop import ExcessPartialApparentEnergyProp -from .transportprop import TransportProp -from .heatcapacityandderivedprop import HeatCapacityAndDerivedProp +from .activityfugacityosmoticprop import ActivityFugacityOsmoticProp from .compositionatphaseequilibrium import CompositionAtPhaseEquilibrium +from .refractionsurfacetensionsoundspeed import RefractionSurfaceTensionSoundSpeed from .reactionstatechangeprop import ReactionStateChangeProp -from .vaporpboilingtazeotroptandp import VaporPBoilingTAzeotropTandP -from .reactionequilibriumprop import ReactionEquilibriumProp +from .volumetricprop import VolumetricProp @forge_signature @@ -106,7 +106,7 @@ class PropertyGroup( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/propertymethodid.py b/pyThermoML/core/propertymethodid.py index afb0244..375752d 100644 --- a/pyThermoML/core/propertymethodid.py +++ b/pyThermoML/core/propertymethodid.py @@ -37,7 +37,7 @@ class PropertyMethodID( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/propertyvalue.py b/pyThermoML/core/propertyvalue.py index 50d5dae..92d4f37 100644 --- a/pyThermoML/core/propertyvalue.py +++ b/pyThermoML/core/propertyvalue.py @@ -7,16 +7,16 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .propuncertainty import PropUncertainty +from .curvedev import CurveDev from .combineduncertainty import CombinedUncertainty -from .asymstduncert import AsymStdUncert +from .asymcombstduncert import AsymCombStdUncert from .asymcombexpanduncert import AsymCombExpandUncert -from .curvedev import CurveDev -from .proplimit import PropLimit from .proprepeatability import PropRepeatability -from .asymcombstduncert import AsymCombStdUncert -from .ecombuncertevalmethod import eCombUncertEvalMethod from .asymexpanduncert import AsymExpandUncert +from .propuncertainty import PropUncertainty +from .ecombuncertevalmethod import eCombUncertEvalMethod +from .asymstduncert import AsymStdUncert +from .proplimit import PropLimit @forge_signature @@ -73,7 +73,7 @@ class PropertyValue( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/proplimit.py b/pyThermoML/core/proplimit.py index 34705f1..321a282 100644 --- a/pyThermoML/core/proplimit.py +++ b/pyThermoML/core/proplimit.py @@ -39,7 +39,7 @@ class PropLimit( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/propphaseid.py b/pyThermoML/core/propphaseid.py index 9fdb3ef..b4d2c68 100644 --- a/pyThermoML/core/propphaseid.py +++ b/pyThermoML/core/propphaseid.py @@ -8,9 +8,9 @@ from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict from .ebiostate import eBioState -from .epropphase import ePropPhase -from .ecrystallatticetype import eCrystalLatticeType from .regnum import RegNum +from .ecrystallatticetype import eCrystalLatticeType +from .epropphase import ePropPhase @forge_signature @@ -53,7 +53,7 @@ class PropPhaseID( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/proprepeatability.py b/pyThermoML/core/proprepeatability.py index 2d9ad3a..8b79126 100644 --- a/pyThermoML/core/proprepeatability.py +++ b/pyThermoML/core/proprepeatability.py @@ -44,7 +44,7 @@ class PropRepeatability( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/propuncertainty.py b/pyThermoML/core/propuncertainty.py index 45379fe..4f23525 100644 --- a/pyThermoML/core/propuncertainty.py +++ b/pyThermoML/core/propuncertainty.py @@ -7,8 +7,8 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .asymstduncert import AsymStdUncert from .asymexpanduncert import AsymExpandUncert +from .asymstduncert import AsymStdUncert @forge_signature @@ -71,7 +71,7 @@ class PropUncertainty( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/pureormixturedata.py b/pyThermoML/core/pureormixturedata.py index c303c17..2e2890b 100644 --- a/pyThermoML/core/pureormixturedata.py +++ b/pyThermoML/core/pureormixturedata.py @@ -8,51 +8,51 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .regnum import RegNum -from .varphaseid import VarPhaseID -from .covariance import Covariance -from .eqconstant import EqConstant -from .property import Property -from .propphaseid import PropPhaseID from .refphaseid import RefPhaseID -from .eqparameter import EqParameter -from .vardevicespec import VarDeviceSpec -from .varuncertainty import VarUncertainty -from .construncertainty import ConstrUncertainty +from .constraintphaseid import ConstraintPhaseID +from .property import Property +from .propdevicespec import PropDeviceSpec +from .variableid import VariableID +from .eqconstraint import EqConstraint +from .regnum import RegNum from .eeqname import eEqName -from .variable import Variable -from .propuncertainty import PropUncertainty -from .equation import Equation -from .auxiliarysubstance import AuxiliarySubstance -from .propertymethodid import PropertyMethodID +from .constraintid import ConstraintID +from .eqproperty import EqProperty +from .epresentation import ePresentation +from .efunction import eFunction +from .combineduncertainty import CombinedUncertainty from .estandardstate import eStandardState -from .eexppurpose import eExpPurpose -from .ecrystallatticetype import eCrystalLatticeType -from .eqvariable import EqVariable -from .component import Component from .proprepeatability import PropRepeatability -from .constraintid import ConstraintID +from .numvalues import NumValues +from .construncertainty import ConstrUncertainty +from .eqvariable import EqVariable from .solvent import Solvent +from .eexppurpose import eExpPurpose +from .equation import Equation from .constrrepeatability import ConstrRepeatability -from .constraintphaseid import ConstraintPhaseID -from .eqproperty import EqProperty +from .constraint import Constraint +from .ecrystallatticetype import eCrystalLatticeType from .propertyvalue import PropertyValue -from .numvalues import NumValues -from .variablevalue import VariableValue -from .ephase import ePhase +from .propuncertainty import PropUncertainty from .erefstatetype import eRefStateType -from .constrdevicespec import ConstrDeviceSpec from .catalyst import Catalyst -from .eqconstraint import EqConstraint -from .efunction import eFunction +from .phaseid import PhaseID +from .variable import Variable +from .auxiliarysubstance import AuxiliarySubstance from .varrepeatability import VarRepeatability -from .combineduncertainty import CombinedUncertainty -from .variableid import VariableID -from .epresentation import ePresentation +from .vardevicespec import VarDeviceSpec +from .constrdevicespec import ConstrDeviceSpec +from .eqparameter import EqParameter +from .varuncertainty import VarUncertainty +from .covariance import Covariance +from .propertymethodid import PropertyMethodID from .curvedev import CurveDev -from .constraint import Constraint -from .phaseid import PhaseID -from .propdevicespec import PropDeviceSpec +from .component import Component +from .ephase import ePhase +from .propphaseid import PropPhaseID +from .variablevalue import VariableValue +from .eqconstant import EqConstant +from .varphaseid import VarPhaseID @forge_signature @@ -133,7 +133,7 @@ class PureOrMixtureData( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/purity.py b/pyThermoML/core/purity.py index 2cc4ad4..369da8a 100644 --- a/pyThermoML/core/purity.py +++ b/pyThermoML/core/purity.py @@ -146,7 +146,7 @@ class Purity( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/reactiondata.py b/pyThermoML/core/reactiondata.py index 12382ac..3963bfc 100644 --- a/pyThermoML/core/reactiondata.py +++ b/pyThermoML/core/reactiondata.py @@ -7,53 +7,53 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .regnum import RegNum -from .varphaseid import VarPhaseID -from .covariance import Covariance -from .eqconstant import EqConstant -from .property import Property -from .propphaseid import PropPhaseID from .refphaseid import RefPhaseID -from .eqparameter import EqParameter -from .vardevicespec import VarDeviceSpec -from .varuncertainty import VarUncertainty -from .construncertainty import ConstrUncertainty -from .eeqname import eEqName -from .variable import Variable -from .propuncertainty import PropUncertainty -from .equation import Equation -from .auxiliarysubstance import AuxiliarySubstance +from .constraintphaseid import ConstraintPhaseID from .participant import Participant -from .propertymethodid import PropertyMethodID +from .property import Property +from .propdevicespec import PropDeviceSpec +from .variableid import VariableID +from .eqconstraint import EqConstraint +from .regnum import RegNum +from .eeqname import eEqName +from .constraintid import ConstraintID +from .eqproperty import EqProperty +from .epresentation import ePresentation +from .efunction import eFunction +from .combineduncertainty import CombinedUncertainty +from .ereactionformalism import eReactionFormalism from .estandardstate import eStandardState -from .eexppurpose import eExpPurpose -from .ecrystallatticetype import eCrystalLatticeType -from .eqvariable import EqVariable -from .ereactiontype import eReactionType +from .ecompositionrepresentation import eCompositionRepresentation from .proprepeatability import PropRepeatability -from .constraintid import ConstraintID +from .numvalues import NumValues +from .construncertainty import ConstrUncertainty +from .eqvariable import EqVariable from .solvent import Solvent +from .eexppurpose import eExpPurpose +from .equation import Equation from .constrrepeatability import ConstrRepeatability -from .constraintphaseid import ConstraintPhaseID -from .eqproperty import EqProperty +from .constraint import Constraint +from .ecrystallatticetype import eCrystalLatticeType from .propertyvalue import PropertyValue -from .numvalues import NumValues -from .variablevalue import VariableValue -from .ephase import ePhase +from .propuncertainty import PropUncertainty from .erefstatetype import eRefStateType -from .constrdevicespec import ConstrDeviceSpec from .catalyst import Catalyst -from .ereactionformalism import eReactionFormalism -from .ecompositionrepresentation import eCompositionRepresentation -from .eqconstraint import EqConstraint -from .efunction import eFunction +from .variable import Variable +from .auxiliarysubstance import AuxiliarySubstance from .varrepeatability import VarRepeatability -from .combineduncertainty import CombinedUncertainty -from .variableid import VariableID -from .epresentation import ePresentation +from .vardevicespec import VarDeviceSpec +from .constrdevicespec import ConstrDeviceSpec +from .eqparameter import EqParameter +from .varuncertainty import VarUncertainty +from .covariance import Covariance +from .propertymethodid import PropertyMethodID from .curvedev import CurveDev -from .constraint import Constraint -from .propdevicespec import PropDeviceSpec +from .ephase import ePhase +from .propphaseid import PropPhaseID +from .ereactiontype import eReactionType +from .variablevalue import VariableValue +from .eqconstant import EqConstant +from .varphaseid import VarPhaseID @forge_signature @@ -145,7 +145,7 @@ class ReactionData( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/reactionequilibriumprop.py b/pyThermoML/core/reactionequilibriumprop.py index 9399b24..5db60b7 100644 --- a/pyThermoML/core/reactionequilibriumprop.py +++ b/pyThermoML/core/reactionequilibriumprop.py @@ -7,9 +7,9 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .epropname import ePropName -from .criticalevaluation import CriticalEvaluation from .prediction import Prediction +from .criticalevaluation import CriticalEvaluation +from .epropname import ePropName from .emethodname import eMethodName @@ -49,7 +49,7 @@ class ReactionEquilibriumProp( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/reactionstatechangeprop.py b/pyThermoML/core/reactionstatechangeprop.py index 38669f1..5b9d126 100644 --- a/pyThermoML/core/reactionstatechangeprop.py +++ b/pyThermoML/core/reactionstatechangeprop.py @@ -7,9 +7,9 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .epropname import ePropName -from .criticalevaluation import CriticalEvaluation from .prediction import Prediction +from .criticalevaluation import CriticalEvaluation +from .epropname import ePropName from .emethodname import eMethodName @@ -49,7 +49,7 @@ class ReactionStateChangeProp( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/refphaseid.py b/pyThermoML/core/refphaseid.py index a10cd66..8e543e7 100644 --- a/pyThermoML/core/refphaseid.py +++ b/pyThermoML/core/refphaseid.py @@ -7,9 +7,9 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict +from .regnum import RegNum from .ecrystallatticetype import eCrystalLatticeType from .erefphase import eRefPhase -from .regnum import RegNum @forge_signature @@ -46,7 +46,7 @@ class RefPhaseID( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/refractionsurfacetensionsoundspeed.py b/pyThermoML/core/refractionsurfacetensionsoundspeed.py index 24598d7..04e0403 100644 --- a/pyThermoML/core/refractionsurfacetensionsoundspeed.py +++ b/pyThermoML/core/refractionsurfacetensionsoundspeed.py @@ -7,9 +7,9 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .epropname import ePropName -from .criticalevaluation import CriticalEvaluation from .prediction import Prediction +from .criticalevaluation import CriticalEvaluation +from .epropname import ePropName from .emethodname import eMethodName @@ -47,7 +47,7 @@ class RefractionSurfaceTensionSoundSpeed( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/regnum.py b/pyThermoML/core/regnum.py index e82e0d6..7119405 100644 --- a/pyThermoML/core/regnum.py +++ b/pyThermoML/core/regnum.py @@ -33,7 +33,7 @@ class RegNum( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/sample.py b/pyThermoML/core/sample.py index 9b564f9..3e8b1b3 100644 --- a/pyThermoML/core/sample.py +++ b/pyThermoML/core/sample.py @@ -7,13 +7,13 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .purity import Purity from .eanalmeth import eAnalMeth -from .epurifmethod import ePurifMethod from .esource import eSource +from .purity import Purity from .estatus import eStatus from .regnum import RegNum from .componentsample import ComponentSample +from .epurifmethod import ePurifMethod @forge_signature @@ -52,7 +52,7 @@ class Sample( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/singleprop.py b/pyThermoML/core/singleprop.py index c7d0265..08ba963 100644 --- a/pyThermoML/core/singleprop.py +++ b/pyThermoML/core/singleprop.py @@ -7,14 +7,14 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .trcrefid import TRCRefID from .etype import eType +from .elanguage import eLanguage from .thesis import Thesis -from .book import Book from .esourcetype import eSourceType -from .elanguage import eLanguage -from .journal import Journal +from .trcrefid import TRCRefID from .evalsinglepropref import EvalSinglePropRef +from .book import Book +from .journal import Journal @forge_signature @@ -42,7 +42,7 @@ class SingleProp( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/solvent.py b/pyThermoML/core/solvent.py index e49085b..ec9564e 100644 --- a/pyThermoML/core/solvent.py +++ b/pyThermoML/core/solvent.py @@ -35,7 +35,7 @@ class Solvent( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/sorgid.py b/pyThermoML/core/sorgid.py index 6235746..6f507b2 100644 --- a/pyThermoML/core/sorgid.py +++ b/pyThermoML/core/sorgid.py @@ -30,7 +30,7 @@ class SOrgID( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/thesis.py b/pyThermoML/core/thesis.py index 8c2ef36..a0ca008 100644 --- a/pyThermoML/core/thesis.py +++ b/pyThermoML/core/thesis.py @@ -44,7 +44,7 @@ class Thesis( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/transportprop.py b/pyThermoML/core/transportprop.py index 78c744a..a2f4702 100644 --- a/pyThermoML/core/transportprop.py +++ b/pyThermoML/core/transportprop.py @@ -7,9 +7,9 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .epropname import ePropName -from .criticalevaluation import CriticalEvaluation from .prediction import Prediction +from .criticalevaluation import CriticalEvaluation +from .epropname import ePropName from .emethodname import eMethodName @@ -47,7 +47,7 @@ class TransportProp( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/trcrefid.py b/pyThermoML/core/trcrefid.py index c9efdd9..421833e 100644 --- a/pyThermoML/core/trcrefid.py +++ b/pyThermoML/core/trcrefid.py @@ -51,7 +51,7 @@ class TRCRefID( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/vaporpboilingtazeotroptandp.py b/pyThermoML/core/vaporpboilingtazeotroptandp.py index 5e4f278..71b3829 100644 --- a/pyThermoML/core/vaporpboilingtazeotroptandp.py +++ b/pyThermoML/core/vaporpboilingtazeotroptandp.py @@ -7,9 +7,9 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .epropname import ePropName -from .criticalevaluation import CriticalEvaluation from .prediction import Prediction +from .criticalevaluation import CriticalEvaluation +from .epropname import ePropName from .emethodname import eMethodName @@ -47,7 +47,7 @@ class VaporPBoilingTAzeotropTandP( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/vardevicespec.py b/pyThermoML/core/vardevicespec.py index cf6f506..70a5093 100644 --- a/pyThermoML/core/vardevicespec.py +++ b/pyThermoML/core/vardevicespec.py @@ -45,7 +45,7 @@ class VarDeviceSpec( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/variable.py b/pyThermoML/core/variable.py index d14cad1..dba1642 100644 --- a/pyThermoML/core/variable.py +++ b/pyThermoML/core/variable.py @@ -7,12 +7,12 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .varphaseid import VarPhaseID -from .solvent import Solvent -from .varrepeatability import VarRepeatability -from .vardevicespec import VarDeviceSpec from .varuncertainty import VarUncertainty from .variableid import VariableID +from .varrepeatability import VarRepeatability +from .vardevicespec import VarDeviceSpec +from .varphaseid import VarPhaseID +from .solvent import Solvent @forge_signature @@ -65,7 +65,7 @@ class Variable( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/variableid.py b/pyThermoML/core/variableid.py index 179801f..297a10a 100644 --- a/pyThermoML/core/variableid.py +++ b/pyThermoML/core/variableid.py @@ -7,8 +7,8 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .variabletype import VariableType from .regnum import RegNum +from .variabletype import VariableType @forge_signature @@ -37,7 +37,7 @@ class VariableID( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/variabletype.py b/pyThermoML/core/variabletype.py index 0ce2d8e..c879779 100644 --- a/pyThermoML/core/variabletype.py +++ b/pyThermoML/core/variabletype.py @@ -7,13 +7,13 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .ecomponentcomposition import eComponentComposition from .etemperature import eTemperature -from .ebiovariables import eBioVariables +from .esolventcomposition import eSolventComposition from .eparticipantamount import eParticipantAmount from .emiscellaneous import eMiscellaneous +from .ecomponentcomposition import eComponentComposition +from .ebiovariables import eBioVariables from .epressure import ePressure -from .esolventcomposition import eSolventComposition @forge_signature @@ -58,7 +58,7 @@ class VariableType( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/variablevalue.py b/pyThermoML/core/variablevalue.py index 907f3aa..b789b32 100644 --- a/pyThermoML/core/variablevalue.py +++ b/pyThermoML/core/variablevalue.py @@ -7,8 +7,8 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .varrepeatability import VarRepeatability from .varuncertainty import VarUncertainty +from .varrepeatability import VarRepeatability @forge_signature @@ -50,7 +50,7 @@ class VariableValue( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/varphaseid.py b/pyThermoML/core/varphaseid.py index 84bb130..00b0212 100644 --- a/pyThermoML/core/varphaseid.py +++ b/pyThermoML/core/varphaseid.py @@ -7,9 +7,9 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .evarphase import eVarPhase -from .ecrystallatticetype import eCrystalLatticeType from .regnum import RegNum +from .ecrystallatticetype import eCrystalLatticeType +from .evarphase import eVarPhase @forge_signature @@ -46,7 +46,7 @@ class VarPhaseID( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/varrepeatability.py b/pyThermoML/core/varrepeatability.py index e7b1d91..d6cc3bd 100644 --- a/pyThermoML/core/varrepeatability.py +++ b/pyThermoML/core/varrepeatability.py @@ -44,7 +44,7 @@ class VarRepeatability( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/varuncertainty.py b/pyThermoML/core/varuncertainty.py index 62480c3..2ed1c6e 100644 --- a/pyThermoML/core/varuncertainty.py +++ b/pyThermoML/core/varuncertainty.py @@ -59,7 +59,7 @@ class VarUncertainty( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/version.py b/pyThermoML/core/version.py index 861fe7f..411ac03 100644 --- a/pyThermoML/core/version.py +++ b/pyThermoML/core/version.py @@ -30,7 +30,7 @@ class Version( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/volumetricprop.py b/pyThermoML/core/volumetricprop.py index e488331..2ec8854 100644 --- a/pyThermoML/core/volumetricprop.py +++ b/pyThermoML/core/volumetricprop.py @@ -7,9 +7,9 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .epropname import ePropName -from .criticalevaluation import CriticalEvaluation from .prediction import Prediction +from .criticalevaluation import CriticalEvaluation +from .epropname import ePropName from .emethodname import eMethodName @@ -47,7 +47,7 @@ class VolumetricProp( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="4d2d23abb157f43b563c9d44de5b83e37a50b96b" + default="decc3d7428f0517c8bc0428fd9785112138a62f6" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict)