Fix tests, update authors.

rajeev02101987 · Jun 26, 2017 · 5d8a878 · 5d8a878
1 parent f2f3e34
commit 5d8a878
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 30 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -8,11 +8,13 @@ Contributors:
 * Ankur Dedania (https://github.com/AbsoluteMSTR)
 * Daniel Hahler (https://github.com/blueyed)
 * Daniel O'onnell' (https://github.com/mruwnik)
+* Diego Rabatone Oliveira (https://github.com/diraol)
 * Fábio C. Barrionuevo da Luz (https://github.com/luzfcb)
 * Grzegorz Śliwiński (https://github.com/fizyk)
 * Jarek Śmiejczak (https://github.com/jotes)
 * Jens Persson (https://github.com/MrShark)
 * Johan Bloemberg (https://github.com/aequitas)
+* Michael (https://github.com/michael-k)
 * Serg Baburin (https://github.com/gmist)
 * Tomasz Karbownicki (https://github.com/trojkat)
 * lukaszpiotr (https://github.com/lukaszpiotr)
diff --git a/pylama/config.py b/pylama/config.py
@@ -70,6 +70,7 @@ def parse_linters(linters):
 
 
 def get_default_config_file(rootdir=None):
+    """Search for configuration file."""
     if rootdir is None:
         return DEFAULT_CONFIG_FILE
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
 # Test requirements
 
 mccabe      >= 0.5.2
-pycodestyle >= 2.0.0
-pydocstyle  >= 1.1.1
-pyflakes    >= 1.3.0
+pycodestyle >= 2.3.1
+pydocstyle  >= 2.0.0
+pyflakes    >= 1.5.0
 # radon       >= 1.4.2
diff --git a/setup.cfg b/setup.cfg
@@ -3,3 +3,30 @@ universal = 1
 
 [wheel]
 universal = 1
+
+[pylama]
+async = 1
+ignore = D203,D213,F0401,C0111,E731,I0011
+linters = pycodestyle,pyflakes,mccabe,pydocstyle,pylint
+paths = pylama
+skip = pylama/inirama.py,pylama/libs/*
+verbose = 0
+
+[pylama:pyflakes]
+builtins = _
+
+[pylama:pylint]
+disable=R0921,E1002
+max-line-length = 100
+
+[pylama:pycodestyle]
+max_line_length = 100
+
+[pylama:pylama/core.py]
+ignore = C901,R0914
+
+[pylama:pylama/main.py]
+ignore = R0914,W0212,C901,E1103
+
+[pylama:test_pylama.py]
+ignore = D,E1103
diff --git a/tox.ini b/tox.ini
@@ -20,30 +20,3 @@ deps =
 commands =
     coverage run --source pylama -m py.test test_pylama.py
     coverage report
-
-[pylama]
-async = 1
-ignore = D203,D213,F0401,C0111,E731
-linters = pycodestyle,pyflakes,mccabe,pydocstyle,pylint
-paths = pylama
-skip = pylama/inirama.py,pylama/libs/*
-verbose = 0
-
-[pylama:pyflakes]
-builtins = _
-
-[pylama:pylint]
-disable=R0921,E1002
-max-line-length = 100
-
-[pylama:pycodestyle]
-max_line_length = 100
-
-[pylama:pylama/core.py]
-ignore = C901,R0914
-
-[pylama:pylama/main.py]
-ignore = R0914,W0212,C901,E1103
-
-[pylama:test_pylama.py]
-ignore = D,E1103