Merge remote-tracking branch 'origin/master' into zope4py2

software/ors-amarisoft/buildout.hash.cfg

@@ -108,7 +108,7 @@ md5sum = 5bf57a9074ea5b054d999789cbbe2c87
 
 [cpu-temperature-promise]
 _update_hash_filename_ = promise/check_cpu_temperature.py
-md5sum = 979a5a3a1eb9d0b081fa014baeef706f
+md5sum = 6812310b65c2d95815afc2b034a5f90f
 
 [interface-up-promise]
 _update_hash_filename_ = promise/check_interface_up.py

software/ors-amarisoft/promise/check_cpu_temperature.py

@@ -79,12 +79,12 @@ class RunPromise(GenericPromise):
       data = psutil.sensors_temperatures()
       cpu_temp = data['coretemp'][0][1]
 
-    l = get_data_interval(self.__log_file, max_avg_temp_duration)
+    l = get_data_interval(self.__log_file, max_avg_temp_duration) or [{'cpu_temperature': cpu_temp}]
     avg_temp = sum(map(lambda x: x['cpu_temperature'], l)) / len(l)
 
     data = json.dumps({'cpu_temperature': cpu_temp, 'avg_cpu_temperature': avg_temp})
     self.json_logger.info("Temperature data", extra={'data': data})
-    
+
     promise_success = True
     if cpu_temp > max_temp:
       self.logger.error("Temperature reached critical threshold: %s degrees celsius (threshold is %s degrees celsius)" % (cpu_temp, max_temp))

stack/erp5/buildout.cfg

@@ -902,6 +902,9 @@ webcolors = 1.10
 rfc3987 = 1.3.8
 jsonpointer = 2.2
 
+pandas = 0.19.2
+numpy = 1.13.1
+scipy = 0.19.0
 
 # WIP Zope 4 ⚠
 Products.CMFCore = 2.6.0