Skip to content

Commit 08b9978

Browse files
teekennedyteekennedy
committed
Merge branch 'develop' for Masterflow migration
2 parents 25c83b1 + bfb2a66 commit 08b9978

File tree

9 files changed

+50
-45
lines changed

9 files changed

+50
-45
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ To install `taurus`, you can simply:
1010
$ pip install taurus-citrine
1111
```
1212

13-
Documentation of this package can be found at https://citrineinformatics.github.io/taurus/
14-
Detailed documentation of the `taurus` data model can be found in the [language-agnostic documentation](https://citrineinformatics.github.io/taurus-documentation/).
13+
Detailed documentation of the `GEMD` data model can be found in the [language-agnostic documentation](https://citrineinformatics.github.io/gemd-docs/).
14+
Documentation of this package can be found [here](https://citrineinformatics.github.io/taurus/).
1515

1616
## Developer instructions
1717
To download the repo and install requirements, run

‎taurus/demo/cake.py

Lines changed: 11 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,18 @@
33

44
import random
55

6-
from taurus.entity.attribute.condition import Condition
7-
from taurus.entity.attribute.parameter import Parameter
8-
from taurus.entity.attribute.property import Property
9-
from taurus.entity.attribute.property_and_conditions import PropertyAndConditions
10-
from taurus.entity.bounds.integer_bounds import IntegerBounds
11-
from taurus.entity.bounds.real_bounds import RealBounds
12-
from taurus.entity.bounds.categorical_bounds import CategoricalBounds
13-
from taurus.entity.bounds.composition_bounds import CompositionBounds
14-
from taurus.entity.object.ingredient_run import IngredientRun
15-
from taurus.entity.object.ingredient_spec import IngredientSpec
16-
from taurus.entity.object.material_run import MaterialRun
17-
from taurus.entity.object.material_spec import MaterialSpec
18-
from taurus.entity.object.measurement_run import MeasurementRun
19-
from taurus.entity.object.measurement_spec import MeasurementSpec
20-
from taurus.entity.object.process_run import ProcessRun
21-
from taurus.entity.object.process_spec import ProcessSpec
22-
from taurus.entity.template.condition_template import ConditionTemplate
23-
from taurus.entity.template.material_template import MaterialTemplate
24-
from taurus.entity.template.measurement_template import MeasurementTemplate
25-
from taurus.entity.template.parameter_template import ParameterTemplate
26-
from taurus.entity.template.process_template import ProcessTemplate
27-
from taurus.entity.template.property_template import PropertyTemplate
28-
from taurus.entity.value.nominal_integer import NominalInteger
29-
from taurus.entity.value.uniform_integer import UniformInteger
30-
from taurus.entity.value.nominal_real import NominalReal
31-
from taurus.entity.value.normal_real import NormalReal
32-
from taurus.entity.value.uniform_real import UniformReal
33-
from taurus.entity.value.nominal_categorical import NominalCategorical
34-
from taurus.entity.value.discrete_categorical import DiscreteCategorical
35-
from taurus.entity.value.nominal_composition import NominalComposition
36-
from taurus.entity.value.empirical_formula import EmpiricalFormula
6+
from taurus.entity.attribute import Condition, Parameter, Property, PropertyAndConditions
7+
from taurus.entity.bounds import IntegerBounds, RealBounds, CategoricalBounds, CompositionBounds
8+
from taurus.entity.object import ProcessSpec, ProcessRun, MaterialSpec, MaterialRun, \
9+
MeasurementSpec, MeasurementRun, IngredientSpec, IngredientRun
10+
from taurus.entity.template import ProcessTemplate, MaterialTemplate, MeasurementTemplate, \
11+
PropertyTemplate, ParameterTemplate, ConditionTemplate
12+
from taurus.entity.value import NominalInteger, UniformInteger, \
13+
NominalReal, NormalReal, UniformReal, \
14+
NominalCategorical, DiscreteCategorical, \
15+
NominalComposition, EmpiricalFormula
3716
from taurus.enumeration.origin import Origin
17+
3818
from taurus.entity.util import complete_material_history, make_instance
3919
from taurus.entity.file_link import FileLink
4020
from taurus.entity.source.performed_source import PerformedSource

‎taurus/entity/attribute/__init__.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
11
"""Attribute objects."""
2+
# flake8: noqa
3+
from .condition import Condition
4+
from .parameter import Parameter
5+
from .property import Property
6+
from .property_and_conditions import PropertyAndConditions

‎taurus/entity/bounds/__init__.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
11
"""Bounds on a value."""
2+
# flake8: noqa
3+
from .categorical_bounds import CategoricalBounds
4+
from .composition_bounds import CompositionBounds
5+
from .integer_bounds import IntegerBounds
6+
from .real_bounds import RealBounds

‎taurus/entity/object/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
"""Run and Spec Objects"""
12
# flake8: noqa
23
from .material_run import MaterialRun
34
from .measurement_run import MeasurementRun

‎taurus/entity/template/__init__.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,8 @@
1-
# flake8: noqa
1+
"""Attribute and Object Templates"""
2+
# flake8: noqa
3+
from .property_template import PropertyTemplate
4+
from .condition_template import ConditionTemplate
5+
from .parameter_template import ParameterTemplate
6+
from .material_template import MaterialTemplate
7+
from .measurement_template import MeasurementTemplate
8+
from .process_template import ProcessTemplate

‎taurus/entity/value/__init__.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,11 @@
1-
# flake8: noqa
1+
"""Value objects"""
2+
# flake8: noqa
3+
from .nominal_real import NominalReal
4+
from .normal_real import NormalReal
5+
from .uniform_real import UniformReal
6+
from .nominal_integer import NominalInteger
7+
from .uniform_integer import UniformInteger
8+
from .discrete_categorical import DiscreteCategorical
9+
from .nominal_categorical import NominalCategorical
10+
from .empirical_formula import EmpiricalFormula
11+
from .nominal_composition import NominalComposition

‎taurus/util/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# flake8: noqa
2-
from .impl import *
2+
from .impl import set_uuids, substitute_links, substitute_objects, flatten, recursive_foreach, \
3+
recursive_flatmap, writable_sort_order

‎taurus/util/impl.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,6 @@
77
from taurus.entity.link_by_uid import LinkByUID
88
from toolz import concatv
99

10-
from taurus.entity.object import MeasurementSpec, ProcessSpec, MaterialSpec, IngredientSpec, \
11-
MeasurementRun, IngredientRun, MaterialRun, ProcessRun
12-
from taurus.entity.template.condition_template import ConditionTemplate
13-
from taurus.entity.template.material_template import MaterialTemplate
14-
from taurus.entity.template.measurement_template import MeasurementTemplate
15-
from taurus.entity.template.parameter_template import ParameterTemplate
16-
from taurus.entity.template.process_template import ProcessTemplate
17-
from taurus.entity.template.property_template import PropertyTemplate
18-
1910

2011
def set_uuids(obj, name="auto"):
2112
"""
@@ -248,6 +239,11 @@ def recursive_flatmap(obj, func, seen=None, unidirectional=True):
248239

249240
def writable_sort_order(key: Union[BaseEntity, str]) -> int:
250241
"""Sort order for flattening such that the objects can be read back and re-nested."""
242+
from taurus.entity.object import MeasurementSpec, ProcessSpec, MaterialSpec, IngredientSpec, \
243+
MeasurementRun, IngredientRun, MaterialRun, ProcessRun
244+
from taurus.entity.template import ConditionTemplate, MaterialTemplate, MeasurementTemplate, \
245+
ParameterTemplate, ProcessTemplate, PropertyTemplate
246+
251247
if isinstance(key, BaseEntity):
252248
typ = key.typ
253249
elif isinstance(key, str):

0 commit comments

Comments
 (0)