Merge branch 'develop'

.bumpversion.cfg

@@ -1,6 +1,6 @@
 [bumpversion]
 commit = True
-current_version = 7.0.3
+current_version = 7.0.4
 files = pylama/__init__.py
 tag = True
 tag_name = {new_version}

pylama/__init__.py

@@ -5,7 +5,7 @@
 :license: BSD, see LICENSE for more details.
 """
 
-__version__ = "7.0.3"
+__version__ = "7.0.4"
 __project__ = "pylama"
 __author__ = "Kirill Klenov <horneds@gmail.com>"
 __license__ = "GNU LGPL"

pylama/core.py

@@ -21,10 +21,11 @@ def run(path='', code=None, rootdir=CURDIR, options=None):
     """
     errors = []
     fileconfig = dict()
-    lname = 'undefined'
-    params = dict()
     linters = LINTERS
     linters_params = dict()
+    lname = 'undefined'
+    params = dict()
+    path = op.relpath(path, rootdir)
 
     if options:
         linters = options.linters
@@ -35,7 +36,6 @@ def run(path='', code=None, rootdir=CURDIR, options=None):
 
     try:
         with CodeContext(code, path) as ctx:
-            path = op.relpath(path, rootdir)
             code = ctx.code
             params = prepare_params(parse_modeline(code), fileconfig, options)
             LOGGER.debug('Checking params: %s', params)
@@ -71,7 +71,7 @@ def run(path='', code=None, rootdir=CURDIR, options=None):
             Error(linter=lname, lnum=e.lineno, col=e.offset, text=e.args[0],
                   filename=path))
 
-    except Exception as e:
+    except Exception as e: # noqa
         import traceback
         LOGGER.info(traceback.format_exc())
 

setup.cfg

@@ -3,9 +3,3 @@ universal = 1
 
 [wheel]
 universal = 1
-
-[pylama]
-path = docs
-
-[pylama:mccabe]
-complexity = 12

setup.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
-""" Setup pylama installation. """
+"""Setup pylama installation."""
+
 import re
 import sys
 from os import path as op

tests.py

@@ -140,7 +140,7 @@ def test_config():
     assert options
     assert options.skip
     assert not options.verbose
-    assert options.path == 'pylama'
+    assert options.paths == ['pylama']
 
     options = parse_options(['-l', 'pep257,pep8', '-i', 'E'])
     linters, _ = zip(*options.linters)