Skip to content

Commit

Permalink
8.14.1 bugfix release: Fix Conditional Function 'timeout' undefined e…
Browse files Browse the repository at this point in the history
…rror ([#1220
  • Loading branch information
kizniche committed Aug 14, 2022
1 parent 2db72d8 commit b278a67
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 8.14.1 (2022-08-14)

### Bugfixes

- Fix Conditional Function 'timeout' undefined error ([#1220](https://github.com/kizniche/Mycodo/issues/1220))


## 8.14.0 (2022-08-13)

### Bugfixes
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Mycodo

Environmental Regulation System

Latest version: 8.14.0
Latest version: 8.14.1

Mycodo is open source software for the Raspberry Pi that couples inputs and outputs in interesting ways to sense and manipulate the environment.

Expand Down
2 changes: 1 addition & 1 deletion mycodo/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
sys.path.append(os.path.abspath(os.path.dirname(__file__)))
from config_translations import TRANSLATIONS as T

MYCODO_VERSION = '8.14.0'
MYCODO_VERSION = '8.14.1'
ALEMBIC_VERSION = '07c7c8ebc195'

# FORCE UPGRADE MASTER
Expand Down
6 changes: 3 additions & 3 deletions mycodo/utils/conditional.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def save_conditional_code(
from mycodo.mycodo_client import DaemonControl
control = DaemonControl(pyro_timeout={timeout})
"""
""".format(timeout=timeout)

if cond_import:
class_code += cond_import
Expand All @@ -72,15 +72,15 @@ def __init__(self, logger, function_id, message):
self.variables = {{}}
self.message = message
self.running = True
"""
""".format(timeout=timeout)

if cond_initialize:
class_code += textwrap.indent(cond_initialize, ' ' * 8)

class_code += """
def conditional_code_run(self):
""".format(timeout=timeout)
"""

if cond_statement:
class_code += textwrap.indent(cond_statement, ' ' * 8)
Expand Down

0 comments on commit b278a67

Please sign in to comment.