Merge pull request #2 from macbre/v2.2.4-dependencies

Update dependencies + tag v2.2.4

Author: macbre

.gitignore

@@ -100,6 +100,7 @@ ENV/
 # mypy
 .mypy_cache/
 
+*.swp
 env*/
 .pytest_cache/
 .idea/

.pylintrc

@@ -0,0 +1,3 @@
+[MESSAGES CONTROL]
+disable=too-many-arguments,unexpected-keyword-arg,pointless-string-statement
+max-line-length=120

.travis.yml

@@ -5,4 +5,4 @@ python:
   - "3.5"
   - "3.6"
 install: pip install -e .[dev]
-script: py.test test
+script: make test && make lint

Makefile

@@ -16,7 +16,7 @@ coverage:
 	coverage report $(coverage_options)
 
 lint:
-	pylint sql_metadata.py
+	pylint wikia_common_kibana.py
 
 publish:
 	# run git tag -a v0.0.0 before running make publish

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup
 
-VERSION = '2.2.3'
+VERSION = '2.2.4'
 
 # @see https://github.com/pypa/sampleproject/blob/master/setup.py
 setup(
@@ -15,8 +15,8 @@
     extras_require={
         'dev': [
             'coverage==4.5.1',
-            'pylint==1.8.2',
-            'pytest==3.4.0',
+            'pylint==1.8.4',
+            'pytest==3.5.1',
         ]
     },
     install_requires=[

wikia_common_kibana.py

@@ -66,7 +66,7 @@ def __init__(
             since = now - period
         else:
             since += 1
-            self._logger.info("Using provided {0} timestamp as since ({1} seconds ago)".format(since, now - since))
+            self._logger.info("Using provided %s timestamp as since (%d seconds ago)", since, now - since)
 
         self._since = since
         self._to = now - self.SHORT_DELAY  # give logs some time to reach Logstash
@@ -78,9 +78,9 @@ def __init__(
             self.format_index(prefix=index_prefix, timestamp=now, sep=index_sep),
         ])
 
-        self._logger.info("Using {} indices".format(self._index))
-        self._logger.info("Querying for messages from between {} and {}".
-                          format(self.format_timestamp(self._since), self.format_timestamp(self._to)))
+        self._logger.info("Using %s indices", self._index)
+        self._logger.info("Querying for messages from between %s and %s",
+                          self.format_timestamp(self._since), self.format_timestamp(self._to))
 
     @staticmethod
     def format_index(prefix, timestamp, sep='-'):
@@ -274,7 +274,7 @@ def get_aggregations(self, query, group_by, stats_field, percents=(50, 95, 99, 9
         # add @timestamp range
         body['query']['bool']['must'].append(self._get_timestamp_filer())
 
-        self._logger.info("Getting aggregations for {} field when grouped by {}".format(group_by, stats_field))
+        self._logger.info("Getting aggregations for %s field when grouped by %s", group_by, stats_field)
 
         res = self._es.search(
             body=body,