Update tox/flake8 config

posita · Feb 7, 2018 · 16734ed · 16734ed
1 parent abeec32
commit 16734ed
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 55 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,6 @@ language: python
 
 python:
     - "2.7"
-    - "3.3"
     - "3.4"
     - "3.5"
     - "3.6"
@@ -25,19 +24,15 @@ env:
     - TWISTED="15"
     - TWISTED="16"
     - TWISTED="17.1"
+    - TWISTED="17.5"
+    - TWISTED="17.9"
     - TWISTED="trunk"
 
 install:
     - pip install coveralls tox-travis
 
 matrix:
     allow_failures:
-        # 3.6 is experimental (needs pylint >= 2.0)
-        - python: "3.6"
-
-        # PyPy3 is experimental
-        - python: "pypy3"
-
         # Twisted trunk is experimental
         - env: TWISTED="trunk"
 

diff --git a/setup.py b/setup.py
@@ -83,7 +83,6 @@
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',

diff --git a/test/__init__.py b/test/__init__.py
@@ -14,8 +14,8 @@
 from __future__ import (
     absolute_import, division, print_function, unicode_literals,
 )
-from builtins import *  # noqa: F401,F403; pylint: disable=redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
-from future.builtins.disabled import *  # noqa: F401,F403; pylint: disable=redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
+from builtins import *  # noqa: F401,F403 # pylint: disable=redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
+from future.builtins.disabled import *  # noqa: F401,F403 # pylint: disable=no-name-in-module,redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
 
 # ---- Imports -----------------------------------------------------------
 

diff --git a/test/symmetries.py b/test/symmetries.py
@@ -14,15 +14,15 @@
 from __future__ import (
     absolute_import, division, print_function, unicode_literals,
 )
-from builtins import *  # noqa: F401,F403; pylint: disable=redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
-from future.builtins.disabled import *  # noqa: F401,F403; pylint: disable=redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
+from builtins import *  # noqa: F401,F403 # pylint: disable=redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
+from future.builtins.disabled import *  # noqa: F401,F403 # pylint: disable=no-name-in-module,redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
 
 # ---- Imports -----------------------------------------------------------
 
 try:
     from unittest import mock  # pylint: disable=no-name-in-module,unused-import,useless-suppression
 except ImportError:
     try:
-        import mock  # noqa: F401; pylint: disable=import-error,unused-import,useless-suppression
+        import mock  # noqa: F401 # pylint: disable=import-error,unused-import,useless-suppression
     except ImportError:
         pass  # mock unavailable
diff --git a/test/test_logging.py b/test/test_logging.py
@@ -15,8 +15,8 @@
 from __future__ import (
     absolute_import, division, print_function, unicode_literals,
 )
-from builtins import *  # noqa: F401,F403; pylint: disable=redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
-from future.builtins.disabled import *  # noqa: F401,F403; pylint: disable=redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
+from builtins import *  # noqa: F401,F403 # pylint: disable=redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
+from future.builtins.disabled import *  # noqa: F401,F403 # pylint: disable=no-name-in-module,redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
 
 # ---- Imports -----------------------------------------------------------
 
@@ -29,7 +29,7 @@
     logerrbackdl,
     logunhandlederr,
 )
-import test  # noqa: F401; pylint: disable=unused-import
+import test  # noqa: F401 # pylint: disable=unused-import
 from test.symmetries import mock
 
 # ---- Constants ---------------------------------------------------------
@@ -47,12 +47,6 @@ class LoggingTestCase(t_unittest.TestCase):
 
     # ---- Public hooks --------------------------------------------------
 
-    def setUp(self):
-        super().setUp()
-
-    def tearDown(self):
-        super().tearDown()
-
     def test_logunhandlederr(self):
         logger = mock.Mock()
         _raiseorreturn = logunhandlederr(logging.DEBUG, logger)(self._raiseorreturn)

diff --git a/test/test_retry.py b/test/test_retry.py
@@ -15,8 +15,8 @@
 from __future__ import (
     absolute_import, division, print_function, unicode_literals,
 )
-from builtins import *  # noqa: F401,F403; pylint: disable=redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
-from future.builtins.disabled import *  # noqa: F401,F403; pylint: disable=redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
+from builtins import *  # noqa: F401,F403 # pylint: disable=redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
+from future.builtins.disabled import *  # noqa: F401,F403 # pylint: disable=no-name-in-module,redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
 
 # ---- Imports -----------------------------------------------------------
 
@@ -35,7 +35,7 @@
     calltimeout,
     calltimeoutexc,
 )
-import test  # noqa: F401; pylint: disable=unused-import
+import test  # noqa: F401 # pylint: disable=unused-import
 from test.symmetries import mock
 
 # ---- Constants ---------------------------------------------------------
@@ -58,9 +58,6 @@ def setUp(self):
         self._clock = t_task.Clock()
         self._state = CallTimeoutTestCase._State(self._clock)
 
-    def tearDown(self):
-        super().tearDown()
-
     def test_deferred_cancel(self):
         delay = 2
         call_val = 'done'

diff --git a/tox.ini b/tox.ini
@@ -11,14 +11,13 @@
 
 [tox]  # -----------------------------------------------------------------
 
-envlist = py{27,33,34,35,36,py,py3}-twisted_{15,16,17_1,trunk}, lint, check
+envlist = py{27,34,35,36,py,py3}-twisted_{15,16,17_1,17_5,17_9,trunk}, lint, check
 skip_missing_interpreters = true
 
 [travis]  # --------------------------------------------------------------
 
 python =
     2.7: py27, lint
-    3.3: py33, lint
     3.4: py34, lint
     3.5: py35, lint, check
     3.6: py36, lint
@@ -31,6 +30,8 @@ TWISTED =
     15: twisted_15
     16: twisted_16
     17.1: twisted_17_1, lint, check
+    17.5: twisted_17_5, lint, check
+    17.9: twisted_17_9, lint, check
     trunk: twisted_trunk
 
 [testenv]  # -------------------------------------------------------------
@@ -43,6 +44,8 @@ deps =
     twisted_15_2: Twisted >= 15.2.0, < 15.6.0
     twisted_16_0: Twisted >= 16.0.0, < 16.7.0
     twisted_17_1: Twisted >= 17.1.0, < 17.2.0
+    twisted_17_5: Twisted >= 17.5.0, < 17.6.0
+    twisted_17_9: Twisted >= 17.9.0, < 17.10.0
     twisted_trunk: git+https://github.com/twisted/twisted.git@trunk
     coverage
     pytest
@@ -100,14 +103,17 @@ commands =
 deps =
     coverage
     flake8
-    pylint
+    pylint >= 1.7.0
 
 setenv =
     PYTHONWARNINGS =
 
-use_develop = true
+usedevelop = true
 
 [flake8]  # --------------------------------------------------------------
 
+# See
+# <https://pycodestyle.readthedocs.io/en/latest/intro.html#error-codes>
+# and <https://flake8.readthedocs.io/en/latest/user/error-codes.html>
 ignore = E128,E201,E202,E302,E305,E501,W503
 # max-line-length = 0
diff --git a/txrc/__init__.py b/txrc/__init__.py
@@ -14,15 +14,15 @@
 from __future__ import (
     absolute_import, division, print_function, unicode_literals,
 )
-from builtins import *  # noqa: F401,F403; pylint: disable=redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
-from future.builtins.disabled import *  # noqa: F401,F403; pylint: disable=redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
+from builtins import *  # noqa: F401,F403 # pylint: disable=redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
+from future.builtins.disabled import *  # noqa: F401,F403 # pylint: disable=no-name-in-module,redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
 
 # ---- Imports -----------------------------------------------------------
 
 import logging as _logging
 
-from .logging import *  # noqa: F401,F403; pylint: disable=wildcard-import
-from .retry import *  # noqa: F401,F403; pylint: disable=wildcard-import
+from .logging import *  # noqa: F401,F403 # pylint: disable=wildcard-import
+from .retry import *  # noqa: F401,F403 # pylint: disable=wildcard-import
 from .version import __version__  # noqa: F401
 
 # ---- Constants ---------------------------------------------------------

diff --git a/txrc/logging.py b/txrc/logging.py
@@ -14,8 +14,8 @@
 from __future__ import (
     absolute_import, division, print_function, unicode_literals,
 )
-from builtins import *  # noqa: F401,F403; pylint: disable=redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
-from future.builtins.disabled import *  # noqa: F401,F403; pylint: disable=redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
+from builtins import *  # noqa: F401,F403 # pylint: disable=redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
+from future.builtins.disabled import *  # noqa: F401,F403 # pylint: disable=no-name-in-module,redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
 
 # ---- Imports -----------------------------------------------------------
 

diff --git a/txrc/retry.py b/txrc/retry.py
@@ -25,8 +25,8 @@
 from __future__ import (
     absolute_import, division, print_function, unicode_literals,
 )
-from builtins import *  # noqa: F401,F403; pylint: disable=redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
-from future.builtins.disabled import *  # noqa: F401,F403; pylint: disable=redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
+from builtins import *  # noqa: F401,F403 # pylint: disable=redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
+from future.builtins.disabled import *  # noqa: F401,F403 # pylint: disable=no-name-in-module,redefined-builtin,unused-wildcard-import,useless-suppression,wildcard-import
 
 # ---- Imports -----------------------------------------------------------
 
@@ -165,11 +165,6 @@ class DoublingBackoffGeneratorFactoryMixin(object):
         for a :class:`RetryingCaller` as a mix-in.
         """
 
-        # ---- Constructor -----------------------------------------------
-
-        def __init__(self, *args, **kw):
-            super().__init__(*args, **kw)
-
         # ---- Public hooks ----------------------------------------------
 
         def buildbackoffgenerator(self, retries):
@@ -198,11 +193,6 @@ class HaltOnFailureInspectorMixin(object):
 
         halt_on = ( t_defer.CancelledError, )
 
-        # ---- Constructor -----------------------------------------------
-
-        def __init__(self, *args, **kw):
-            super().__init__(*args, **kw)
-
         # ---- Public hooks ----------------------------------------------
 
         def buildfailureinspector(self):
@@ -238,11 +228,6 @@ class RetryOnFailureInspectorMixin(object):
 
         retry_on = ( DeferredTimeoutError, )
 
-        # ---- Constructor -----------------------------------------------
-
-        def __init__(self, *args, **kw):
-            super().__init__(*args, **kw)
-
         # ---- Public hooks ----------------------------------------------
 
         def buildfailureinspector(self):