cleanup travis & lints

Author: radix

.travis.yml

@@ -2,15 +2,15 @@ sudo: false
 
 language: python
 python:
-    - "2.7"
-    - "2.6"
-    - "3.4"
-    - "pypy"
+    - "3.6"
+    - "3.7"
+    - "3.8"
+    - "pypy3"
 install:
     - pip install -r dev-requirements.txt
     - pip install .
 script:
-    - make lint
+    - flake8
     - py.test
     - make doc
 

Makefile

@@ -1,6 +1,3 @@
-lint:
-	flake8 --ignore=E131,E731,W503 txeffect/
-
 build-dist:
 	rm -rf dist
 	python setup.py sdist bdist_wheel

setup.cfg

@@ -3,3 +3,7 @@
 # 3. If at all possible, it is good practice to do this. If you cannot, you
 # will need to generate wheels for each Python version that you support.
 universal=1
+
+[flake8]
+max-line-length = 100
+ignore = E131,E731,W503

setup.py

@@ -13,7 +13,7 @@
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 3',
-        ],
+    ],
     packages=['txeffect'],
     install_requires=['effect', 'twisted'],
-    )
+)

txeffect/__init__.py

@@ -16,7 +16,6 @@
 from functools import partial
 
 from twisted.internet.defer import Deferred
-from twisted.python.failure import Failure
 from twisted.internet.task import deferLater
 
 from effect import (

txeffect/test_txeffect.py

@@ -1,7 +1,6 @@
 from __future__ import absolute_import
 
 from functools import partial
-import sys
 
 from testtools import TestCase
 from testtools.matchers import MatchesListwise, Equals
@@ -110,7 +109,7 @@ def test_perform_failure(self):
         self.assertEqual(str(f.value), 'oh dear')
         self.assertRegex(
             f.getTraceback().splitlines()[-3],
-            '^\s+File ".*?test_txeffect.py", line \d+, in test_perform_failure$')
+            r'^\s+File ".*?test_txeffect.py", line \d+, in test_perform_failure$')
 
 
 class DeferredPerformerTests(TestCase):