From 2394733d23c527cefb81243759028ec5bb3feb59 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Tue, 21 Apr 2015 23:26:38 +0200 Subject: Add tox.ini to run tests with tox on Python 2.6, 2.7 and 3.4 * MANIFEST.in: add regen-docs & tox.ini --- .hgignore | 1 + MANIFEST.in | 2 ++ docs/news.txt | 2 ++ setup.py | 13 ++++++++++++- tox.ini | 10 ++++++++++ 5 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 tox.ini diff --git a/.hgignore b/.hgignore index 09b0959..36cfdf7 100644 --- a/.hgignore +++ b/.hgignore @@ -11,3 +11,4 @@ syntax: glob dist/ build/ docs/_build +.tox diff --git a/MANIFEST.in b/MANIFEST.in index d310570..cc3f4ba 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2,6 +2,8 @@ recursive-include docs *.txt *.css *.js include docs/_templates/*.html include docs/conf.py include docs/test_server.ini +include regen-docs +include tox.ini recursive-exclude docs/_build/_sources * recursive-include docs/_build *.html recursive-include tests *.txt *.py *.cgi *.html diff --git a/docs/news.txt b/docs/news.txt index 1239c87..58071f1 100644 --- a/docs/news.txt +++ b/docs/news.txt @@ -23,6 +23,8 @@ hg tip * Fixed parsing of paths beginning with multiple forward slashes. +* Add tox.ini to run tests with tox. + 1.7.5.1 ------- diff --git a/setup.py b/setup.py index 9ff4382..2197f98 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,19 @@ # Procedure to release a new version: -# - run tests +# +# - run tests: run tox # - update version in setup.py (__version__) # - update changelog: docs/news.txt # - modify setup.py: set RELEASE to True +# - check that "python setup.py sdist" contains all files tracked by +# the SCM (Mercurial): update MANIFEST.in if needed +# +# - hg ci +# - hg tag VERSION +# - hg push +# - python setup.py register sdist bdist_wheel upload +# +# - increment version in setup.py (__version__) +# - hg ci && hg push # If true, then the svn revision won't be used to calculate the # revision (set to True for real releases) diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..27fbcb8 --- /dev/null +++ b/tox.ini @@ -0,0 +1,10 @@ +[tox] +envlist = py26,py27,py34 + +[testenv] +deps= + nose + six +commands= + nosetests + -- cgit v1.2.1