Merge remote-tracking branch 'origin/master'

docs/check_sphinx.py

 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

tox.ini

@@ -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]