Merge branch 'bugfix/travis' into develop

vmalloc · vmalloc · commit 69aa30b358dc · 2019-02-12T11:59:17.000+02:00
diff --git a/setup.cfg b/setup.cfg
@@ -16,9 +16,11 @@ testing =
     slash>=1.5.0
     Flask
     Flask-Loopback
-    pylint
-    pytest
-    pytest-cov
+    pylint~=1.7.0
+    pytest; python_version < '3.0'
+    pytest>4.0; python_version >= '3.0'
+    pytest-cov<2.6; python_version < '3.0'
+    pytest-cov>=2.6; python_version >= '3.0'
     URLObject
     weber-utils
 
diff --git a/tests/test_backslash.py b/tests/test_backslash.py
@@ -1,4 +1,4 @@
 # py.test style tests here
 
 def test_import():
-    import backslash  # pylint: disable=trailing-newlines, unused-variable
+    import backslash  # pylint: disable=trailing-newlines, unused-variable,unused-import
diff --git a/tests/test_slash_plugin.py b/tests/test_slash_plugin.py
@@ -9,7 +9,7 @@
 
 
 def test_importing_slash_plugin():
-    from backslash.contrib import slash_plugin  # pylint: disable=unused-variable
+    from backslash.contrib import slash_plugin  # pylint: disable=unused-variable,unused-import
 
 
 def test_exception_distilling(traceback):
