diff --git a/.gitignore b/.gitignore index e63adb45..04e21472 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -Tailbone.egg-info +.tox/ +Tailbone.egg-info/ diff --git a/setup.cfg b/setup.cfg index 5ec1ac59..7712ec72 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,6 +2,5 @@ nocapture = 1 cover-package = tailbone cover-erase = 1 -cover-inclusive = 1 cover-html = 1 cover-html-dir = htmlcov diff --git a/setup.py b/setup.py index 7fbd44dd..e4cbec16 100644 --- a/setup.py +++ b/setup.py @@ -61,12 +61,21 @@ requires = [ # # package # low high + # For now, let's restrict FormEncode to 1.2 since the 1.3 release + # introduces some deprecation warnings. Once we're running 1.2 everywhere + # in production, we can start looking at adding 1.3 support. + # TODO: Remove this restriction. + 'FormEncode<=1.2.99', # 1.2.4 1.2.6 + # Pyramid 1.3 introduced 'pcreate' command (and friends) to replace - # deprecated 'paster create' (and friends). - 'pyramid>=1.3a1', # 1.3b2 + # deprecated 'paster create' (and friends). Also for now, let's restrict + # Pyramid to 1.4 since the 1.5 release introduces some + # backwards-incompatible changes. Once we're running 1.4 everywhere in + # production, we can start looking at adding 1.5 support. + # TODO: Remove the latter restriction. + 'pyramid>=1.3a1,<=1.4.99', # 1.3b2 1.4.5 'FormAlchemy', # 1.4.2 - 'FormEncode', # 1.2.4 'Mako', # 0.6.2 'pyramid_beaker>=0.6', # 0.6.1 'pyramid_debugtoolbar', # 1.0 diff --git a/tox.ini b/tox.ini new file mode 100644 index 00000000..817c9a61 --- /dev/null +++ b/tox.ini @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- + +[tox] +envlist = py26, py27 + +[testenv] +deps = + coverage + fixture + mock + nose +commands = nosetests {posargs} + +[testenv:coverage] +basepython = python +commands = nosetests {posargs:--with-coverage --cover-html-dir={envtmpdir}/coverage} + +[testenv:docs] +basepython = python +deps = Sphinx +changedir = docs +commands = sphinx-build -b html -d {envtmpdir}/doctrees -W -T . {envtmpdir}/docs