Add new 'test' extras and update tox.ini accordingly.

This commit is contained in:
Wilfried Teiken 2016-01-06 02:44:19 -05:00
parent d2ced2de6a
commit 52c487f462
3 changed files with 9 additions and 11 deletions

View file

@ -135,9 +135,8 @@ class DNS01Test(unittest.TestCase):
def setUp(self):
from acme.challenges import DNS01
self.msg = DNS01(
token=jose.decode_b64jose(
'evaGxfADs6pSRb2LAv9IZf17Dt3juxGJ+PCt92wr+oA'))
self.msg = DNS01(token=jose.decode_b64jose(
'evaGxfADs6pSRb2LAv9IZf17Dt3juxGJ+PCt92wr+oA'))
self.jmsg = {
'type': 'dns-01',
'token': 'evaGxfADs6pSRb2LAv9IZf17Dt3juxGJ-PCt92wr-oA',

View file

@ -35,7 +35,7 @@ if sys.version_info < (2, 7, 9):
install_requires.append('ndg-httpsclient')
install_requires.append('pyasn1')
dev_extras = [
dns_extras = [
'dnspython',
]
@ -46,7 +46,6 @@ docs_extras = [
]
testing_extras = [
'dnspython',
'nose',
'tox',
]
@ -79,7 +78,7 @@ setup(
include_package_data=True,
install_requires=install_requires,
extras_require={
'dev': dev_extras,
'dns': dns_extras,
'docs': docs_extras,
'testing': testing_extras,
},

10
tox.ini
View file

@ -33,23 +33,23 @@ setenv =
[testenv:py33]
commands =
pip install -e acme[testing]
pip install -e acme[dev,testing]
nosetests -v acme
[testenv:py34]
commands =
pip install -e acme[testing]
pip install -e acme[dev,testing]
nosetests -v acme
[testenv:py35]
commands =
pip install -e acme[testing]
pip install -e acme[dev,testing]
nosetests -v acme
[testenv:cover]
basepython = python2.7
commands =
pip install -e acme -e .[testing] -e letsencrypt-apache -e letsencrypt-nginx -e letshelp-letsencrypt
pip install -e acme[dns] -e .[testing] -e letsencrypt-apache -e letsencrypt-nginx -e letshelp-letsencrypt
./tox.cover.sh
[testenv:lint]
@ -59,7 +59,7 @@ basepython = python2.7
# duplicate code checking; if one of the commands fails, others will
# continue, but tox return code will reflect previous error
commands =
pip install -e acme -e .[dev] -e letsencrypt-apache -e letsencrypt-nginx -e letsencrypt-compatibility-test -e letshelp-letsencrypt
pip install -e acme -e .[dns,dev] -e letsencrypt-apache -e letsencrypt-nginx -e letsencrypt-compatibility-test -e letshelp-letsencrypt
./pep8.travis.sh
pylint --rcfile=.pylintrc letsencrypt
pylint --rcfile=.pylintrc acme/acme