summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorHolger Krekel <holger@merlinux.eu>2016-06-20 18:19:01 +0200
committerHolger Krekel <holger@merlinux.eu>2016-06-20 18:19:01 +0200
commit524486c4e2c9138f115708303de1d527a51b596d (patch)
treec4b16e29ee51e7548afbdd276881863f0456726e /tox.ini
parentfe8a1ba5216c71421f8a83ef62f3aabed634371b (diff)
parentd467ba8e26bb70d4abc7b951332701ffca7fc118 (diff)
downloadtox-524486c4e2c9138f115708303de1d527a51b596d.tar.gz
Merged in jayvdb/tox (pull request #185)
Unescape \{..\} according to docs.
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini10
1 files changed, 9 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 17efc83..a2bbd96 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,6 +13,13 @@ deps=pytest>=2.3.5
[testenv:py26-bare]
deps =
commands = tox -h
+install_command = pip install {opts} {packages}
+list_dependencies_command = pip freeze
+
+[testenv:py26]
+install_command = pip install {opts} {packages}
+list_dependencies_command = pip freeze
+
[testenv:docs]
basepython=python
@@ -27,7 +34,7 @@ platform=linux
deps = pytest-flakes>=0.2
pytest-pep8
-commands =
+commands =
py.test --flakes -m flakes tox tests
py.test --pep8 -m pep8 tox tests
@@ -53,3 +60,4 @@ pep8maxlinelength = 99
# E731 - do not assign a lambda expression, use a def
pep8ignore =
*.py W503 E402 E731
+flakes-ignore = ImportStarUsage