diff options
| author | Marko Tibold | 2011-12-30 16:17:12 +0100 |
|---|---|---|
| committer | Marko Tibold | 2011-12-30 16:17:12 +0100 |
| commit | 28f1b027aa8b452378a89118b938f24b2383dc9a (patch) | |
| tree | 195644952b7249c4ef5b84d4f0558d8b31c6534c | |
| parent | b29732536945bc6504ab064dc6b9242618eaf126 (diff) | |
| parent | a1d31c8a3a9e694da7cea8a03579ff938000bf96 (diff) | |
| download | django-rest-framework-28f1b027aa8b452378a89118b938f24b2383dc9a.tar.bz2 | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | docs/check_sphinx.py | 7 | ||||
| -rw-r--r-- | tox.ini | 79 |
2 files changed, 78 insertions, 8 deletions
diff --git a/docs/check_sphinx.py b/docs/check_sphinx.py index 74874eed..feb04abd 100644 --- a/docs/check_sphinx.py +++ b/docs/check_sphinx.py @@ -1,13 +1,6 @@ import pytest import subprocess -def test_linkcheck(tmpdir): - doctrees = tmpdir.join("doctrees") - htmldir = tmpdir.join("html") - subprocess.check_call( - ["sphinx-build", "-q", "-blinkcheck", - "-d", str(doctrees), ".", str(htmldir)]) - def test_build_docs(tmpdir): doctrees = tmpdir.join("doctrees") htmldir = "html" #we want to keep the docs @@ -9,13 +9,18 @@ envlist= py25-django13, py26-django13, py27-django13, - + py25-django14a1, + py26-django14a1, + py27-django14a1, py25-django12e, py26-django12e, py27-django12e, py25-django13e, py26-django13e, py27-django13e + py25-django14a1e, + py26-django14a1e, + py27-django14a1e ########################################### CORE TESTS ############################################ @@ -83,6 +88,36 @@ deps= # Optional packages: markdown +[testenv:py25-django14a1] +basepython=python2.5 +deps= + http://www.djangoproject.com/download/1.4-alpha-1/tarball/ + coverage==3.4 + unittest-xml-reporting==1.2 + Pyyaml==3.10 + # Optional packages: + markdown + +[testenv:py26-django14a1] +basepython=python2.6 +deps= + http://www.djangoproject.com/download/1.4-alpha-1/tarball/ + coverage==3.4 + unittest-xml-reporting==1.2 + Pyyaml==3.10 + # Optional packages: + markdown + +[testenv:py27-django14a1] +basepython=python2.7 +deps= + http://www.djangoproject.com/download/1.4-alpha-1/tarball/ + coverage==3.4 + unittest-xml-reporting==1.2 + Pyyaml==3.10 + # Optional packages: + markdown + ####################################### EXAMPLES ################################################ [testenv:py25-django12e] @@ -169,6 +204,48 @@ deps= unittest-xml-reporting==1.2 Pyyaml==3.10 +[testenv:py25-django14a1e] +basepython=python2.5 +commands= + python examples/runtests.py +deps= + http://www.djangoproject.com/download/1.4-alpha-1/tarball/ + coverage==3.4 + wsgiref==0.1.2 + Pygments==1.4 + httplib2==0.6.0 + Markdown==2.0.3 + unittest-xml-reporting==1.2 + Pyyaml==3.10 + +[testenv:py26-django14a1e] +basepython=python2.6 +commands= + python examples/runtests.py +deps= + http://www.djangoproject.com/download/1.4-alpha-1/tarball/ + coverage==3.4 + wsgiref==0.1.2 + Pygments==1.4 + httplib2==0.6.0 + Markdown==2.0.3 + unittest-xml-reporting==1.2 + Pyyaml==3.10 + +[testenv:py27-django14a1e] +basepython=python2.7 +commands= + python examples/runtests.py +deps= + http://www.djangoproject.com/download/1.4-alpha-1/tarball/ + coverage==3.4 + wsgiref==0.1.2 + Pygments==1.4 + httplib2==0.6.0 + Markdown==2.0.3 + unittest-xml-reporting==1.2 + Pyyaml==3.10 + ##########################################DOCS################################################# [testenv:docs] |