From 09e22a3bc378a6c2e43120bab60650fd74f99a6b Mon Sep 17 00:00:00 2001 From: Prabhu Tamilarasan Date: Tue, 12 Nov 2019 15:01:21 -0600 Subject: [PATCH 1/3] Allow passing through arbitrary aggregations --- predix/data/timeseries.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/predix/data/timeseries.py b/predix/data/timeseries.py index 440fb48..4675cd5 100644 --- a/predix/data/timeseries.py +++ b/predix/data/timeseries.py @@ -312,11 +312,7 @@ def get_datapoints(self, tags, start=None, end=None, order=None, if not isinstance(aggregations, list): aggregations = [aggregations] - query['aggregations'] = [] - for aggregation in aggregations: - query['aggregations'].append({ - 'sampling': {'datapoints': 1}, - 'type': aggregation }) + query['aggregations'] = aggregations params['tags'].append(query) From 5981f0aa290d4b815a7213ffc4b6bd77bdcd09be Mon Sep 17 00:00:00 2001 From: Prabhu Tamilarasan Date: Mon, 7 Dec 2020 15:38:11 -0600 Subject: [PATCH 2/3] Remove static python-dateutil version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d662a15..78a27e0 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages install_requires = [ - "python-dateutil==2.6.0", + "python-dateutil>=2.6.0", "boto3", "PyYAML", "requests", From 846577c36d39a3aee09509bbeb6a26baa448c517 Mon Sep 17 00:00:00 2001 From: Prabhu Tamilarasan Date: Tue, 8 Dec 2020 08:35:04 -0600 Subject: [PATCH 3/3] Remove incorrect websocket dependency --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 78a27e0..546a224 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,6 @@ "six", "future", "psycopg2", - "websocket", "websocket-client" ]