Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
klen committed Sep 4, 2015
2 parents 7074f44 + 37e2976 commit 250b6e6
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
@@ -1,6 +1,6 @@
[bumpversion]
commit = True
current_version = 7.0.0
current_version = 7.0.1
files = pylama/__init__.py
tag = True
tag_name = {new_version}
Expand Down
1 change: 1 addition & 0 deletions AUTHORS
Expand Up @@ -7,6 +7,7 @@ Contributors:

* Daniel Hahler (https://github.com/blueyed)
* Daniel O'onnell' (https://github.com/mruwnik)
* Fábio C. Barrionuevo da Luz (https://github.com/luzfcb)
* Grzegorz Śliwiński (https://github.com/fizyk);
* Jarek Śmiejczak (https://github.com/jarekps);
* Jens Persson (https://github.com/MrShark)
Expand Down
10 changes: 6 additions & 4 deletions README.rst
Expand Up @@ -106,13 +106,13 @@ Command line options
usage: pylama [-h] [--verbose] [--version] [--format {pep8,pylint}]
[--select SELECT] [--sort SORT] [--linters LINTERS]
[--ignore IGNORE] [--skip SKIP] [--report REPORT] [--hook]
[--async] [--options OPTIONS] [--force]
[path]
[--async] [--options OPTIONS] [--force] [--abspath]
[paths [paths ...]]
Code audit tool for python.
positional arguments:
path Path on file or directory for code check.
paths Paths to files or directories for code check.
optional arguments:
-h, --help show this help message and exit
Expand All @@ -125,7 +125,7 @@ Command line options
--sort SORT Sort result by error types. Ex. E,W,D
--linters LINTERS, -l LINTERS
Select linters. (comma-separated). Choices are
pep257,mccabe,pep8,pyflakes.
mccabe,pep8,pyflakes,pep257.
--ignore IGNORE, -i IGNORE
Ignore errors and warnings. (comma-separated)
--skip SKIP Skip files by masks (comma-separated, Ex.
Expand All @@ -139,6 +139,8 @@ Command line options
Select configuration file. By default is
'<CURDIR>/pylama.ini'
--force, -F Force code checking (if linter doesnt allow)
--abspath, -a Use absolute paths in output.


.. _modeline:

Expand Down
2 changes: 1 addition & 1 deletion pylama/__init__.py
Expand Up @@ -5,7 +5,7 @@
:license: BSD, see LICENSE for more details.
"""

__version__ = "7.0.0"
__version__ = "7.0.1"
__project__ = "pylama"
__author__ = "Kirill Klenov <horneds@gmail.com>"
__license__ = "GNU LGPL"
2 changes: 2 additions & 0 deletions pylama/config.py
Expand Up @@ -160,6 +160,8 @@ def parse_options(args=None, config=True, rootdir=CURDIR, **overrides): # noqa
LOGGER.info('Find option %s (%s)', k, v)
passed_value = getattr(options, k, _Default())
if isinstance(passed_value, _Default):
if k == 'paths':
v = v.split()
setattr(options, k, _Default(v))

# Parse file related options
Expand Down
2 changes: 1 addition & 1 deletion pylama/lint/extensions.py
@@ -1,4 +1,4 @@
""" Load extensions. """
"""Load extensions."""

LINTERS = {}

Expand Down
8 changes: 4 additions & 4 deletions pylama/lint/pylama_pep8.py
Expand Up @@ -12,7 +12,7 @@

class Linter(Abstract):

"""PEP8 runner. """
"""PEP8 runner."""

@staticmethod
def run(path, code=None, params=None, **meta):
Expand All @@ -39,13 +39,13 @@ def __init__(self, *args, **kwargs):
self.errors = []

def init_file(self, filename, lines, expected, line_offset):
""" Prepare storage for errors. """
"""Prepare storage for errors."""
super(_PEP8Report, self).init_file(
filename, lines, expected, line_offset)
self.errors = []

def error(self, line_number, offset, text, check):
""" Save errors. """
"""Save errors."""
code = super(_PEP8Report, self).error(
line_number, offset, text, check)

Expand All @@ -58,7 +58,7 @@ def error(self, line_number, offset, text, check):
))

def get_file_results(self):
""" Get errors.
"""Get errors.
:return list: List of errors.
Expand Down
3 changes: 3 additions & 0 deletions setup.cfg
Expand Up @@ -4,5 +4,8 @@ universal = 1
[wheel]
universal = 1

[pylama]
path = docs

[pylama:mccabe]
complexity = 12
1 change: 1 addition & 0 deletions setup.py
Expand Up @@ -28,6 +28,7 @@
description=_read('DESCRIPTION'),
long_description=_read('README.rst'),
platforms=('Any'),
zip_safe=False,
keywords='pylint pep8 pyflakes mccabe linter qa pep257'.split(),

author='Kirill Klenov',
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Expand Up @@ -29,7 +29,7 @@ commands =
async = 1
ignore = F0401,C0111,E731
linters = pep8,pyflakes,mccabe,pep257,pylint
path = pylama
paths = pylama
skip = pylama/inirama.py,pylama/libs/*
verbose = 0

Expand Down

0 comments on commit 250b6e6

Please sign in to comment.