Reconfigure flake8

pubnub · Sep 5, 2016 · 4e86444 · 4e86444
1 parent 43419f5
commit 4e86444
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py
@@ -372,7 +372,7 @@ def _perform_heartbeat_loop(self):
                 if heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL:
                     self._listener_manager.announce_stateus(envelope.status)
 
-        except PubNubTornadoException as e:
+        except PubNubTornadoException:
             pass
             # TODO: check correctness
             # if e.status is not None and e.status.category == PNStatusCategory.PNTimeoutCategory:

diff --git a/scripts/run-tests.py b/scripts/run-tests.py
@@ -14,32 +14,38 @@
 pyenv_version = os.getenv('PYENV_VERSION', 0)
 travis_version = os.getenv('TRAVIS_PYTHON_VERSION', 0)
 version = str(travis_version or pyenv_version)
-cmn = 'py.test tests --cov-report=xml --cov=./pubnub --ignore=tests/integrational/twisted '
+tcmn = 'py.test tests --cov-report=xml --cov=./pubnub --ignore=tests/integrational/twisted '
+fcmn = 'flake8 --exclude=src/,.cache,.git,.idea,.tox,._trial_temp/'
+
 
 print("Version is", version)
 
 
 def run(command):
     return check_call(command, shell=True)
 
-if not version.startswith('2.6'):
-    run('flake8')
 
 if version.startswith('2.6'):
     run(
-        '%s--ignore=tests/integrational/tornado/ --ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % cmn)  # noqa: E501
+        '%s--ignore=tests/integrational/tornado/ --ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % tcmn)  # noqa: E501
 elif version.startswith('2.7'):
     # TODO: remove twisted ignore option when the tests will be ready
-    run('%s --ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % cmn)
+    run("%s,*asyncio*,*python_v35*" % fcmn)
+    run('%s --ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % tcmn)
 elif version.startswith('3.3'):
-    run('%s--ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % cmn)
+    run("%s,*asyncio*,*python_v35*" % fcmn)
+    run('%s--ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % tcmn)
 elif version.startswith('3.4'):
-    run('%s--ignore=tests/integrational/python_v35/ ' % cmn)
+    run("%s,*python_v35*" % fcmn)
+    run('%s--ignore=tests/integrational/python_v35/ ' % tcmn)
 elif version.startswith('3.5'):
-    run(cmn)
+    run(fcmn)
+    run(tcmn)
 elif version.startswith('3.6'):
-    run(cmn)
+    run(fcmn)
+    run(tcmn)
 elif version.startswith('pypy'):
-    run('%s--ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % cmn)
+    run("%s,*asyncio*,*python_v35*" % fcmn)
+    run('%s--ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % tcmn)
 else:
     raise Exception("Version %s is not supported by this script runner" % version)
diff --git a/setup.cfg b/setup.cfg
@@ -3,5 +3,4 @@ norecursedirs = benchmarks
 
 [flake8]
 max-line-length = 120
-exclude=src/,.cache,.git,.idea,.tox,._trial_temp/
 ignore=E402
diff --git a/tests/integrational/vcr_helper.py b/tests/integrational/vcr_helper.py
@@ -56,7 +56,7 @@ def object_in_path_matcher(r1, r2, decrypter=None):
             else:
                 assert v == path2[k]
 
-    except AssertionError as e:
+    except AssertionError:
         return False
 
     return True
@@ -69,7 +69,7 @@ def object_in_body_matcher(r1, r2, decrypter=None):
         else:
             assert json.loads(url_decode(r1.body.decode('utf-8'))) == json.loads(url_decode(r2.body.decode('utf-8')))
 
-    except AssertionError as e:
+    except AssertionError:
         return False
 
     return True