Merge branch 'master' into clean-coverage

.travis.yml

@@ -18,11 +18,12 @@ env:
     - FORCE_TEST_VCS=hg
     - FORCE_TEST_VCS=svn
 install:
-    - pip install coverage coveralls mock
+    - pip install coverage coveralls mock flake8
 script:
     - SKIP_NO_TESTS=1 coverage run setup.py test -q
     - coverage report -m
     - python check_manifest.py
+    - flake8 *.py
 after_script:
     - coveralls
 notifications:

check_manifest.py

@@ -714,8 +714,8 @@ def _get_ignore_from_manifest_lines(lines):
                     # of sub directories.  We could use a regexp, but
                     # two ignores seems easier.
                     ignore.append(dirname + os.path.sep + pattern)
-                    ignore.append(dirname + os.path.sep + '*' + os.path.sep +
-                                  pattern)
+                    ignore.append(
+                        dirname + os.path.sep + '*' + os.path.sep + pattern)
         elif cmd == 'prune':
             # rest is considered to be a directory name.  It should
             # not contain a path separator, as it actually has no
@@ -732,8 +732,8 @@ def _get_ignore_from_manifest_lines(lines):
 
 def file_matches(filename, patterns):
     """Does this filename match any of the patterns?"""
-    return any(fnmatch.fnmatch(filename, pat) or
-               fnmatch.fnmatch(os.path.basename(filename), pat)
+    return any(fnmatch.fnmatch(filename, pat)
+               or fnmatch.fnmatch(os.path.basename(filename), pat)
                for pat in patterns)
 
 

setup.cfg

@@ -14,11 +14,12 @@ addopts = --doctest-modules --ignore=setup.py
 python-file-with-version = check_manifest.py
 
 [flake8]
-ignore=E241,E501,E261,E126,E127,E128,E302
+ignore = E241,E501,E261,E126,E127,E128,E302,W503
 # E241: multiple spaces after ','
 # E501: line too long
 # E261: at least two spaces before inline comment
 # E126: continuation line over-indented for hanging indent
 # E127: continuation line over-indented for visual indent
 # E128: continuation line under-indented for visual indent
 # E302: expected 2 blank lines, found 0
+# W503: line break before binary operator

setup.py

@@ -1,5 +1,9 @@
 #!/usr/bin/env python
-import os, re, ast, email.utils, sys
+import ast
+import email.utils
+import os
+import re
+import sys
 from setuptools import setup
 
 if sys.version_info < (2, 7):
@@ -38,14 +42,9 @@
               'linter'],
     classifiers=[
         'Development Status :: 4 - Beta',
-##      'Development Status :: 5 - Production/Stable', eventually...
         'Environment :: Console',
         'Intended Audience :: Developers',
-        'License :: OSI Approved :: GNU General Public License (GPL)'
-            if licence.startswith('GPL') else
         'License :: OSI Approved :: MIT License'
-            if licence.startswith('MIT') else
-        'License :: uhh, dunno',  # fail PyPI upload intentionally until fixed
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py34,py35,py36,py37,pypy,pypy3
+    py27,py34,py35,py36,py37,pypy,pypy3,flake8
 
 [testenv]
 passenv = LANG LC_CTYPE LC_ALL MSYSTEM
@@ -27,3 +27,9 @@ commands =
 commands =
     python --version
     nosetests {posargs}
+
+
+[testenv:flake8]
+skip_install = true
+deps = flake8
+commands = flake8 *.py