Compare commits

..

No commits in common. "1f24d7486b1acbed200c798c97890348e40c80b7" and "4ea79271e7c5ead49d89314dbbf62ca1134d3f89" have entirely different histories.

6 changed files with 10 additions and 31 deletions

View file

@ -1,5 +1,5 @@
[bumpversion] [bumpversion]
current_version = 0.1.5 current_version = 0.1.4
commit = True commit = True
tag = True tag = True

View file

@ -6,7 +6,7 @@ with open('README.rst') as f:
setuptools.setup( setuptools.setup(
name='TSGRain Controller', name='TSGRain Controller',
version='0.1.5', version='0.1.4',
author='ThetaDev', author='ThetaDev',
description='TSGRain irrigation controller', description='TSGRain irrigation controller',
long_description=README, long_description=README,

View file

@ -1 +1 @@
__version__ = '0.1.5' __version__ = '0.1.4'

View file

@ -176,7 +176,6 @@ class Application(models.AppInterface):
systimecfg.set_system_timezone(tz, self.cfg.cmd_set_timezone) systimecfg.set_system_timezone(tz, self.cfg.cmd_set_timezone)
def start(self): def start(self):
"""Starte die Anwendung"""
logging.info('Starting application') logging.info('Starting application')
self._running = True self._running = True
self.io.start() self.io.start()
@ -186,7 +185,6 @@ class Application(models.AppInterface):
self.grpc_server.start() self.grpc_server.start()
def stop(self): def stop(self):
"""Stoppe die Anwendung"""
logging.info('Stopping application') logging.info('Stopping application')
self._running = False self._running = False
self.grpc_server.stop(None) self.grpc_server.stop(None)

View file

@ -96,10 +96,6 @@ class Job:
) )
def validate(self, app: 'AppInterface'): def validate(self, app: 'AppInterface'):
"""
Prüfe, ob der Task gültige Daten enthält
(Zonen existieren, Bewässerungszeit > 0)
"""
if not self.zones: if not self.zones:
raise util.InvalidInputException('No zones set') raise util.InvalidInputException('No zones set')
if self.duration < 1: if self.duration < 1:

View file

@ -129,20 +129,9 @@ class StoppableThread(threading.Thread):
pass pass
def run_cycle(self): def run_cycle(self):
""" pass
Führe einen Durchlauf des Threads aus.
Diese Funktion darf nicht blockieren, sonst kann der
Thread nicht gestoppt werden.
"""
def run(self): def run(self):
"""
Führe die ``run_cycle()``-Funktion in
Endlosschleife aus, mit einer durch das
``interval``-Attribut bestimmten Verzögerung zwischen
den Durchläufen.
"""
try: try:
self.setup() self.setup()
@ -157,10 +146,6 @@ class StoppableThread(threading.Thread):
sys.excepthook(*sys.exc_info()) sys.excepthook(*sys.exc_info())
def stop(self): def stop(self):
"""
Stoppe den Thread und warte bis er beendet. Dies dauert
maximal ``interval`` + Durchlaufzeit von ``run_cycle()``.
"""
self._stop_signal.set() self._stop_signal.set()
try: try:
self.join() self.join()