Updated CI test to use pylint 2.2.2 (#852)

Author: joachimmetz

.pylintrc

@@ -76,7 +76,7 @@ load-plugins=
 # W1201: Specify string format arguments as logging function parameters
 # W0201: Variables defined initially outside the scope of __init__ (reconsider this, added by Kristinn).
 #disable=C0103,C0111,C0302,F0401,I0010,I0011,R0201,R0801,R0901,R0902,R0903,R0904,R0911,R0912,R0913,R0914,R0915,R0921,R0922,R0924,W0122,W0141,W0142,W0402,W0404,W0511,W0603,W0703,W1201,W0201
-disable=C0103,C0302,F0401,I0010,I0011,R0201,R0801,R0901,R0902,R0903,R0904,R0911,R0912,R0913,R0914,R0915,R0921,R0922,R0924,W0122,W0141,W0142,W0402,W0404,W0511,W0603,W0703,W1201,W0201,R0401,no-member,useless-super-delegation
+disable=C0103,C0302,F0401,I0010,I0011,R0201,R0801,R0901,R0902,R0903,R0904,R0911,R0912,R0913,R0914,R0915,R0921,R0922,R0924,W0122,W0141,W0142,W0402,W0404,W0511,W0603,W0703,W1201,W0201,R0401,no-member,useless-super-delegation,useless-object-inheritance
 
 
 [REPORTS]

.travis.yml

@@ -30,8 +30,8 @@ cache:
 - yarn
 - pip
 install:
+- ./config/travis/install.sh
 - pip install -r requirements.txt
-- if test ${TARGET} = "pylint"; then pip install astroid==1.5.3 pylint==1.7.2; fi
 - yarn install
 script:
 - ./config/travis/run_with_timeout.sh 30 ./config/travis/runtests.sh

api_client/python/timesketch_api_client/client.py

@@ -17,6 +17,7 @@
 import json
 import uuid
 
+# pylint: disable=wrong-import-order
 import bs4
 import requests
 

config/travis/install.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+#
+# Script to set up Travis-CI test VM.
+#
+# This file is generated by l2tdevtools update-dependencies.py any dependency
+# related changes should be made in dependencies.ini.
+
+# Exit on error.
+set -e;
+if test ${TRAVIS_OS_NAME} = "linux" && test ${TARGET} != "jenkins";
+then
+	if test ${TARGET} = "pylint";
+	then
+		sudo add-apt-repository ppa:gift/pylint3 -y;
+	fi
+
+	sudo apt-get update -q;
+
+	if test ${TARGET} = "pylint";
+	then
+		sudo apt-get install -y pylint;
+	fi
+fi

config/travis/runtests.sh

@@ -12,7 +12,7 @@ if test "${TARGET}" = "pylint";
 then
 	pylint --version
 
-	for FILE in `find run_tests.py setup.py config timesketch tests -name \*.py`;
+	for FILE in `find run_tests.py setup.py api_client config timesketch -name \*.py`;
 	do
 		echo "Checking: ${FILE}";
 

timesketch/lib/aggregators/interface.py

@@ -15,8 +15,8 @@
 
 from __future__ import unicode_literals
 
-from flask import current_app
 from elasticsearch import Elasticsearch
+from flask import current_app
 
 import pandas
 

timesketch/lib/analyzers/browser_timeframe.py

@@ -127,7 +127,7 @@ def get_active_hours(frame):
         hours = sorted(hours)
 
         hour_len = len(hours)
-        if hour_len >= 3 and hour_len <= 12:
+        if 3 <= hour_len <= 12:
             thresholds[threshold] = hour_len
 
     threshold_counter = collections.Counter(thresholds)