From a876a664df358c04d1ae5d7eb67b5c55af53c5bc Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Sat, 11 Jul 2015 16:11:09 +0000 Subject: [PATCH] Add py3 tox tests for acme.jose --- .dockerignore | 4 +++- .gitignore | 2 ++ acme/setup.py | 10 ++++++++++ tox.ini | 8 +++++++- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.dockerignore b/.dockerignore index 0bdb9e62d..5ee05ea89 100644 --- a/.dockerignore +++ b/.dockerignore @@ -6,6 +6,8 @@ # test docker on their git working directories. .git -tox.cover +tox.venv +tox.venv3 venv +venv3 docs diff --git a/.gitignore b/.gitignore index 2441f1a74..990564fca 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,8 @@ build/ dist/ /venv/ +/venv3/ +/tox.venv/ /tox.venv/ letsencrypt.log diff --git a/acme/setup.py b/acme/setup.py index 481a35eb6..8ce3399cc 100644 --- a/acme/setup.py +++ b/acme/setup.py @@ -18,13 +18,23 @@ install_requires = [ 'werkzeug', ] +testing_extras = [ + 'nose', + 'tox', +] + + setup( name='acme', packages=find_packages(), install_requires=install_requires, + extras_require={ + 'testing': testing_extras, + }, entry_points={ 'console_scripts': [ 'jws = acme.jose.jws:CLI.run', ], }, + test_suite='acme', ) diff --git a/tox.ini b/tox.ini index dc6fb567a..d1b9253ed 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,7 @@ # acme and letsencrypt are not yet on pypi, so when Tox invokes # "install *.zip", it will not find deps skipsdist = true -envlist = py26,py27,cover,lint +envlist = py26,py27,py34,cover,lint [testenv] # share one venv across testenvs, instead of multiple @@ -26,6 +26,12 @@ setenv = PYTHONHASHSEED = 0 # https://testrun.org/tox/latest/example/basic.html#special-handling-of-pythonhas +[testenv:py34] +envdir = {toxinidir}/tox.venv3 +commands = + pip install -e acme[testing] + nosetests acme/acme/jose + [testenv:cover] basepython = python2.7 commands =