From 679d10d4dc1ef5fc3b21050e6af5eac87abe37ec Mon Sep 17 00:00:00 2001
From: avollkopf <43980694+avollkopf@users.noreply.github.com>
Date: Sun, 29 Jan 2023 12:26:03 +0100
Subject: [PATCH] newer pandas in requirements

---
 cbpi/controller/log_file_controller.py | 7 ++-----
 requirements.txt                       | 2 +-
 setup.py                               | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/cbpi/controller/log_file_controller.py b/cbpi/controller/log_file_controller.py
index a4ab4e7..9e8c9a0 100644
--- a/cbpi/controller/log_file_controller.py
+++ b/cbpi/controller/log_file_controller.py
@@ -154,15 +154,12 @@ class LogController:
         return data
 
     async def get_data2(self, ids) -> dict:
-        def dateparse(time_in_secs):
-            return datetime.datetime.strptime(time_in_secs, '%Y-%m-%d %H:%M:%S')
         
+        dateparse = lambda dates: [datetime.datetime.strptime(d, '%Y-%m-%d %H:%M:%S') for d in dates]       
         result = dict()
         for id in ids:
-            # df = pd.read_csv("./logs/sensor_%s.log" % id, parse_dates=True, date_parser=dateparse, index_col='DateTime', names=['DateTime',"Values"], header=None) 
-            # concat all logs
             all_filenames = glob.glob(os.path.join(self.logsFolderPath,f"sensor_{id}.log*"))
-            df = pd.concat([pd.read_csv(f, parse_dates=True, date_parser=dateparse, index_col='DateTime', names=['DateTime', 'Values'], header=None) for f in all_filenames])
+            df = pd.concat([pd.read_csv(f, parse_dates=['DateTime'], date_parser=dateparse, index_col='DateTime', names=['DateTime', 'Values'], header=None) for f in all_filenames])
             df = df.resample('60s').max()
             df = df.dropna()
             result[id] = {"time": df.index.astype(str).tolist(), "value":df.Values.tolist()}
diff --git a/requirements.txt b/requirements.txt
index e54863f..9bcb800 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ cryptography==36.0.1
 requests==2.28.1 
 voluptuous==0.13.1 
 pyfiglet==0.8.post1 
-pandas==1.4.1
+pandas==1.5.3
 shortuuid==1.0.11
 tabulate==0.9.0
 numpy==1.24.1
diff --git a/setup.py b/setup.py
index eedd5d5..5e32bee 100644
--- a/setup.py
+++ b/setup.py
@@ -61,7 +61,7 @@ setup(name='cbpi4',
           'cbpi4gui',
           'importlib_metadata',
           'numpy==1.24.1',
-          'pandas==1.4.1'] + (
+          'pandas==1.5.3'] + (
           ['RPi.GPIO==0.7.1'] if raspberrypi else [] ),
 
         dependency_links=[