diff options
author | Jakub Warmuz <jakub@warmuz.org> | 2015-02-09 01:54:40 +0300 |
---|---|---|
committer | Jakub Warmuz <jakub@warmuz.org> | 2015-02-09 01:54:40 +0300 |
commit | 0849e2d21ec2a89b6802f88a3ad410210b771e53 (patch) | |
tree | 3c96ba18ff016deee6bd8bb624d91502636b1909 /tox.ini | |
parent | 74c02363e7afb30f0c6a24fb7c7e41b770a0ec2c (diff) | |
parent | bbd5c8ef2aa28e61cc8fae6e63f1bc7c5df4c033 (diff) |
Merge remote-tracking branch 'github/letsencrypt/master' into acme
Conflicts:
tox.ini
Diffstat (limited to 'tox.ini')
-rw-r--r-- | tox.ini | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -7,7 +7,7 @@ envlist = py26,py27,cover,lint [testenv] commands = - python setup.py develop easy_install letsencrypt[testing] + pip install -e .[testing] python setup.py test -q # -q does not suppress errors setenv = @@ -16,12 +16,12 @@ setenv = [testenv:cover] basepython = python2.7 commands = - python setup.py develop easy_install letsencrypt[testing] + pip install -e .[testing] python setup.py nosetests --with-coverage --cover-min-percentage=71 [testenv:lint] # recent versions of pylint do not support Python 2.6 (#97, #187) basepython = python2.7 commands = - python setup.py dev + pip install -e .[dev] pylint --rcfile=.pylintrc letsencrypt |