From 23979a9953f5dc7d0a5ffcb6c5d1e7573dabd3f3 Mon Sep 17 00:00:00 2001
From: Marko Tibold <marko@tibold.nl>
Date: Fri, 30 Dec 2011 13:42:01 +0100
Subject: [PATCH 1/2] Added django 1.4 aplha 1.

---
 tox.ini | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 78 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 1375568cb..015b5d2e4 100644
--- a/tox.ini
+++ b/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]

From a1d31c8a3a9e694da7cea8a03579ff938000bf96 Mon Sep 17 00:00:00 2001
From: Marko Tibold <marko@tibold.nl>
Date: Fri, 30 Dec 2011 16:01:15 +0100
Subject: [PATCH 2/2] drop linkchecking

---
 docs/check_sphinx.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/docs/check_sphinx.py b/docs/check_sphinx.py
index 74874eede..feb04abd2 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