Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/1.2.3 #51

Merged
merged 11 commits into from
May 29, 2020
Merged
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@ plynx.egg-info/
web/.DS_Store
web/static/bower_components/
*.pyc
venv
ui/report.20200526.173030.25.0.001.json
.idea
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
# built documents.
#
# The short X.Y version.
version = '1.2.2'
version = '1.2.3'
# The full version, including alpha/beta/rc tags.
release = '1.2.2 beta'
release = version

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion plynx/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
Interactive, Scalable, Shareable and Reproducible Workflow Orchestration framework
"""

__version__ = '1.2.2'
__version__ = '1.2.3'
1 change: 1 addition & 0 deletions plynx/constants/parameter_types.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
class ParameterTypes:
STR = 'str'
INT = 'int'
FLOAT = 'float'
BOOL = 'bool'
TEXT = 'text'
ENUM = 'enum'
Expand Down
8 changes: 8 additions & 0 deletions plynx/db/node.py
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,8 @@ def _get_default_by_type(parameter_type):
return ''
if parameter_type == ParameterTypes.INT:
return 0
if parameter_type == ParameterTypes.FLOAT:
return 0
if parameter_type == ParameterTypes.BOOL:
return False
if parameter_type == ParameterTypes.TEXT:
Expand Down Expand Up @@ -546,6 +548,12 @@ def _value_is_valid(value, parameter_type):
except Exception:
return False
return True
if parameter_type == ParameterTypes.FLOAT:
try:
float(str(value))
except Exception:
return False
return True
if parameter_type == ParameterTypes.BOOL:
return isinstance(value, int)
if parameter_type == ParameterTypes.TEXT:
Expand Down
2 changes: 2 additions & 0 deletions plynx/plugins/executors/local.py
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,8 @@ def _prepare_parameters(self):
value = parameter.value.value
elif parameter.parameter_type == ParameterTypes.INT:
value = int(parameter.value)
elif parameter.parameter_type == ParameterTypes.FLOAT:
value = float(parameter.value)
else:
value = parameter.value
res[parameter.name] = value
Expand Down
Loading