Use setup.cfg for pytest and tox

MANIFEST.in

@@ -1,9 +1,25 @@
-include LICENSE AUTHORS CHANGES README.md NOTICE celery_worker.py babel.cfg pytest.ini
+include LICENSE
+include AUTHORS
+include CHANGES
+include README.md
+include CONTRIBUTING.md
+include NOTICE
+include celery_worker.py
+include wsgi.py
+include babel.cfg
+include pytest.ini
+include setup.cfg
+include requirements.txt
+include requirements-dev.txt
+
 graft flaskbb
 graft tests
 graft migrations
+
 prune flaskbb/themes/*/node_modules
 prune flaskbb/themes/*/.sass-cache
 prune flaskbb/themes/*/src/*
+
 global-exclude __pycache__
 global-exclude *.py[co]
+global-exclude *.sw[a-z]

pytest.ini

@@ -1,3 +0,0 @@
-[pytest]
-norecursedirs = docs flaskbb logs migrations whoosh_index
-addopts =  -vvl --strict --cov=flaskbb --cov-report=term-missing tests

tox.ini → setup.cfg

@@ -6,6 +6,10 @@ deps = -rrequirements-dev.txt
 whitelist_externals = make
 commands = py.test
 
+[tool:pytest]
+norecursedirs = docs flaskbb logs migrations whoosh_index
+addopts =  -vvl --strict --cov=flaskbb --cov-report=term-missing tests
+
 [flake8]
 ignore = E712, E711, C901
 exclude =
@@ -20,3 +24,6 @@ exclude =
     dist,
     *.egg-info
 max-complexity = 10
+
+[bdist_wheel]
+universal=1