starred/certbot-certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-07-30 18:04:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove mock as an install requirement.

Browse Source 
The motivation is to free us of a reliance on a rather modern version of setuptools, which caused le-auto failures for people on Wheezy and other older distros. (The alternative would have been to forcibly upgrade setuptools as the old le-auto did, but less is more.)

Mock is used only in tests, so we move it to tests_require. It will still be installed automatically when setup.py test is run. Give all packages a test_suite so this works.

The "testing" extra remains for optional packages not required for the nose tests but used in tox. However, the extra is much less useful now and is a candidate for deletion. We could roll the list of packages therein into the tox config so as not to favor any particular package.

Remove tests_require=install_requires, which I don't think does anything useful, since install requirements are implicitly installed when running setup.py test.

Fix tests to pass with mock removed. We had to stop them pulling down LE from PyPI, since the current version there (0.1.1) requires mock and explodes when `letsencrypt` is run.
This commit is contained in:
Erik Rose
2016-01-11 21:26:41 -05:00
parent 66ca7449cb
commit 6c05197a43
15 changed files with 83 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tox.ini
+14 -17
View File
@@ -8,23 +8,20 @@
skipsdist = true
envlist = py26,py27,py33,py34,py35,cover,lint
# nosetest -v => more verbose output, allows to detect busy waiting
# loops, especially on Travis
[testenv]
# packages installed separately to ensure that dowstream deps problems
# packages installed separately to ensure that downstream deps problems
# are detected, c.f. #1002
commands =
pip install -e acme[testing]
nosetests -v acme
pip install -e .[testing]
nosetests -v letsencrypt
pip install -e acme
python acme/setup.py test
pip install -e .
python setup.py test
pip install -e letsencrypt-apache
nosetests -v letsencrypt_apache
python letsencrypt-apache/setup.py test
pip install -e letsencrypt-nginx
nosetests -v letsencrypt_nginx
python letsencrypt-nginx/setup.py test
pip install -e letshelp-letsencrypt
nosetests -v letshelp_letsencrypt
python letshelp-letsencrypt/setup.py test
setenv =
PYTHONPATH = {toxinidir}
@@ -33,18 +30,18 @@ setenv =
[testenv:py33]
commands =
pip install -e acme[testing]
nosetests -v acme
pip install -e acme
python acme/setup.py test
[testenv:py34]
commands =
pip install -e acme[testing]
nosetests -v acme
pip install -e acme
python acme/setup.py test
[testenv:py35]
commands =
pip install -e acme[testing]
nosetests -v acme
pip install -e acme
python acme/setup.py test
[testenv:cover]
basepython = python2.7