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) diff --git a/setup.py b/setup.py index d662a15..546a224 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", @@ -12,7 +12,6 @@ "six", "future", "psycopg2", - "websocket", "websocket-client" ]