Skip to content

Commit

Permalink
Move pytest config to setup.cfg
Browse files Browse the repository at this point in the history
Should close #62
  • Loading branch information
borntyping committed Dec 14, 2018
1 parent 83f33e1 commit 31691fb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
7 changes: 7 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
[bdist_wheel]
universal = 1

[tool:pytest]
addopts = -p no:logging

[flake8]
exclude = colorlog/tests
ignore = D203
7 changes: 0 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ deps=
lint: flake8_docstrings
test: pytest

[flake8]
exclude=colorlog/tests
ignore=D203

[testenv:release]
commands=
python setup.py sdist bdist_wheel
Expand All @@ -24,6 +20,3 @@ skip_sdist=true
deps=
wheel
twine

[pytest]
addopts=-p no:logging

0 comments on commit 31691fb

Please sign in to comment.