Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gemd/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "3.0.2"
__version__ = "4.0.0"
2 changes: 0 additions & 2 deletions gemd/demo/cake.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,12 +195,10 @@ def make_cake_templates():
tmpl["Procuring"] = ProcessTemplate(
name="Procuring",
description="Buyin' stuff",
allowed_names=[], # Takes no ingredients by definition
)
tmpl["Baking"] = ProcessTemplate(
name="Baking",
description="Using heat to promote chemical reactions in a material",
allowed_names=["batter"],
allowed_labels=["precursor"],
conditions=[(tmpl["Oven temperature"], RealBounds(0, 700, "degF"))],
parameters=[(tmpl["Oven temperature setting"], RealBounds(100, 550, "degF"))],
Expand Down
22 changes: 0 additions & 22 deletions gemd/entity/template/process_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@ class ProcessTemplate(
`Tags <https://citrineinformatics.github.io/gemd-documentation/specification/tags/>`_
are hierarchical strings that store information about an entity. They can be used
for filtering and discoverability.
allowed_names: List[str], optional
Deprecated. This field does not limit ingredient names.
The Citrine Platform ignores this list when you save a template. When you fetch a
template, this list has the distinct ingredient names from process specs that use
the template. Names come from datasets you can read. GEMD Python keeps this field
to give users time to migrate code and JSON away from it.
allowed_labels: List[str], optional
The set of labels that a process' ingredients are allowed to use in their labels field.
conditions: List[~gemd.entity.template.condition_template.ConditionTemplate] or \
Expand All @@ -61,7 +55,6 @@ def __init__(
description=None,
conditions=None,
parameters=None,
allowed_names=None,
allowed_labels=None,
uids=None,
tags=None,
Expand All @@ -70,24 +63,9 @@ def __init__(
HasConditionTemplates.__init__(self, conditions)
HasParameterTemplates.__init__(self, parameters)

self._allowed_names = None
self.allowed_names = allowed_names

self._allowed_labels = None
self.allowed_labels = allowed_labels

@property
def allowed_names(self):
"""Get the allowed names."""
return self._allowed_names

@allowed_names.setter
def allowed_names(self, allowed_names):
if allowed_names is None:
self._allowed_names = validate_list([], str)
else:
self._allowed_names = validate_list(allowed_names, str)

@property
def allowed_labels(self):
"""Get the allowed labels."""
Expand Down
12 changes: 0 additions & 12 deletions tests/entity/template/test_process_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,6 @@ def test_bounds_mismatch():
ProcessTemplate("a process template", conditions=[[cond_template, object_bounds]])


def test_allowed_names():
"""Test that allowed_names can be assigned.

Presently allowed_names is not used for any validation, but this test can be expanded
if it is used in the future.
"""
allowed_names = ["THF", "Carbon Disulfide", "Dimethyl Ether"]
proc_template = ProcessTemplate(name="test template", allowed_names=allowed_names)
for name in allowed_names:
assert name in proc_template.allowed_names


def test_allowed_labels():
"""Test that allowed_labels can be assigned.

Expand Down
Loading