Skip to content

Commit

Permalink
Merge pull request openshift#3566 from detiber/testConfigs
Browse files Browse the repository at this point in the history
separate out test tool configs from setup.cfg
  • Loading branch information
detiber authored Mar 6, 2017
2 parents 6a002fb + 62bfa9e commit c84081d
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 28 deletions.
4 changes: 4 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[flake8]
exclude=.tox,utils,inventory
max_line_length = 120
ignore = E501,T003
2 changes: 1 addition & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ confidence=
# --enable=similarities". If you want to run only the classes checker, but have
# no Warning level messages displayed, use"--disable=all --enable=classes
# --disable=W"
#disable=
disable=fixme,locally-disabled,file-ignored,duplicate-code


[REPORTS]
Expand Down
18 changes: 18 additions & 0 deletions pytest.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
[pytest]
norecursedirs =
.*
__pycache__
cover
docs
# utils has it's own config
utils
python_files =
# TODO(rhcarvalho): rename test files to follow a single pattern. "test*.py"
# is Python unittest's default, while pytest discovers both "test_*.py" and
# "*_test.py" by default.
test_*.py
*_tests.py
addopts =
--cov=.
--cov-report=term
--cov-report=html
27 changes: 0 additions & 27 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,3 @@ universal=1

[yamllint]
excludes=.tox,utils,files

[lint]
lint_disable=fixme,locally-disabled,file-ignored,duplicate-code

[flake8]
exclude=.tox/*,utils/*,inventory/*
max_line_length = 120
ignore = E501,T003

[tool:pytest]
norecursedirs =
.*
__pycache__
cover
docs
# utils have its own config
utils
python_files =
# TODO(rhcarvalho): rename test files to follow a single pattern. "test*.py"
# is Python unittest's default, while pytest discovers both "test_*.py" and
# "*_test.py" by default.
test_*.py
*_tests.py
addopts =
--cov=.
--cov-report=term
--cov-report=html

0 comments on commit c84081d

Please sign in to comment.