Browse Source

Use tox from make test

pull/2081/head
Markus Unterwaditzer 8 years ago
parent
commit
a4ed3d2806
  1. 7
      Makefile
  2. 2
      setup.cfg
  3. 2
      test-requirements.txt
  4. 6
      tox.ini

7
Makefile

@ -3,11 +3,8 @@
all: clean-pyc test all: clean-pyc test
test: test:
pip install -r test-requirements.txt -q pip install -r test-requirements.txt
FLASK_DEBUG= py.test tests examples tox -e py-release
tox-test:
tox
audit: audit:
python setup.py audit python setup.py audit

2
setup.cfg

@ -8,4 +8,4 @@ universal = 1
license_file = LICENSE license_file = LICENSE
[tool:pytest] [tool:pytest]
norecursedirs = .* *.egg *.egg-info env* artwork docs examples norecursedirs = .* *.egg *.egg-info env* artwork docs

2
test-requirements.txt

@ -1 +1 @@
pytest tox

6
tox.ini

@ -4,9 +4,13 @@ envlist = {py26,py27,pypy}-{lowest,release,devel}{,-simplejson}, {py33,py34,py35
[testenv] [testenv]
passenv = LANG
usedevelop=true usedevelop=true
commands = commands =
py.test [] --cov=flask --cov-report html # We need to install those after Flask is installed.
pip install -e examples/flaskr
pip install -e examples/minitwit
py.test --cov=flask --cov-report html []
deps= deps=
pytest pytest
pytest-cov pytest-cov

Loading…
Cancel
Save