Skip to content

Commit 23f4ced

Browse files
Merge pull request #86 from EasyScience/develop
2 parents 59c4a90 + 14dadf8 commit 23f4ced

File tree

3 files changed

+8
-25
lines changed

3 files changed

+8
-25
lines changed

src/easyscience/Objects/Variable.py

-4
Original file line numberDiff line numberDiff line change
@@ -304,10 +304,6 @@ def value(self, value: Any):
304304
:param value: New value of self
305305
:return: None
306306
"""
307-
if not self.enabled:
308-
if global_object.debug:
309-
raise CoreSetException(f'{str(self)} is not enabled.')
310-
return
311307
self.__deepValueSetter(value)
312308
if self._callback.fset is not None:
313309
try:

src/easyscience/__version__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '1.1.1'
1+
__version__ = '1.1.2'

tests/unit_tests/Objects/test_Descriptor_Parameter.py

+7-20
Original file line numberDiff line numberDiff line change
@@ -134,32 +134,19 @@ def test_Parameter_value_get(element, expected):
134134
def test_item_value_set(instance, enabled, debug):
135135
global_object.debug = debug
136136
set_value = 2
137+
137138
d = instance("test", 1)
138139
if enabled is not None:
139140
d.enabled = enabled
140-
else:
141-
enabled = True
142-
if enabled:
143-
d.value = set_value
144-
assert d.raw_value == set_value
145-
else:
146-
if debug:
147-
with pytest.raises(CoreSetException):
148-
d.value = set_value
141+
d.value = set_value
142+
assert d.raw_value == set_value
143+
149144
d = instance("test", 1, units="kelvin")
150145
if enabled is not None:
151146
d.enabled = enabled
152-
else:
153-
enabled = True
154-
155-
if enabled:
156-
d.value = set_value
157-
assert d.raw_value == set_value
158-
assert str(d.unit) == "kelvin"
159-
else:
160-
if debug:
161-
with pytest.raises(CoreSetException):
162-
d.value = set_value
147+
d.value = set_value
148+
assert d.raw_value == set_value
149+
assert str(d.unit) == "kelvin"
163150

164151

165152
@pytest.mark.parametrize("instance", (Descriptor, Parameter), indirect=True)

0 commit comments

Comments
 (0)