From 4a7d26e4ee9645d95b7c3bf09af4d00c798bf07f Mon Sep 17 00:00:00 2001 From: Luigi Mori Date: Fri, 14 Feb 2020 10:59:50 +0100 Subject: [PATCH] Updates cifsdk to 2.0.14, fixes arrow and fix oversight in CSV Signed-off-by: Luigi Mori --- minemeld/ft/cif.py | 2 +- minemeld/ft/csv.py | 1 + requirements.txt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/minemeld/ft/cif.py b/minemeld/ft/cif.py index c1b4e876..f7e4ebc0 100644 --- a/minemeld/ft/cif.py +++ b/minemeld/ft/cif.py @@ -136,7 +136,7 @@ def _build_iterator(self, now): ) if self.last_successful_run is None: filters['reporttime'] = '{0}Z'.format( - now.replace(days=-days).format('YYYY-MM-DDTHH:mm:ss') + now.shift(days=-days).format('YYYY-MM-DDTHH:mm:ss') ) else: filters['reporttime'] = '{0}Z'.format( diff --git a/minemeld/ft/csv.py b/minemeld/ft/csv.py index 3eaab7c9..c8f68d1f 100644 --- a/minemeld/ft/csv.py +++ b/minemeld/ft/csv.py @@ -26,6 +26,7 @@ import csv import requests import yaml +import shutil from urllib3.response import GzipDecoder from . import basepoller diff --git a/requirements.txt b/requirements.txt index 1648999b..eaf51084 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,7 +23,7 @@ ujson==1.34 filelock==2.0.4 sleekxmpp==1.3.1 beautifulsoup4==4.4.1 -cifsdk==2.0.0b7 +cifsdk==2.0.14 lz4==0.8.2 networkx==1.11 unicodecsv==0.14.1