From 81d5e38a0c5fbf1cdb5e39864081a9f1df135640 Mon Sep 17 00:00:00 2001
From: Eric Holscher <eric@ericholscher.com>
Date: Sat, 2 Aug 2014 08:31:13 -0700
Subject: [PATCH] Switch test runner to py.test

---
 .gitignore           | 1 +
 pip_requirements.txt | 2 +-
 runtests.sh          | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index c6fe0530c85..6e3be6d19fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ media/htmlzip
 media/man
 media/pdf
 media/static
+readthedocs/rtd_tests/builds
 readthedocs/rtd_tests/tests/builds
 user_builds
 user_uploads
diff --git a/pip_requirements.txt b/pip_requirements.txt
index c6d6827590c..fa37753cc82 100644
--- a/pip_requirements.txt
+++ b/pip_requirements.txt
@@ -21,7 +21,7 @@ django-guardian==1.2.0
 django-extensions==1.3.8
 South==0.8.4
 djangorestframework==2.3.14 
-django-nose==1.2
+django-pytest==2.6.2
 
 requests==2.3.0
 slumber==0.6.0
diff --git a/runtests.sh b/runtests.sh
index da7a040a954..5d3a74e80eb 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -1,5 +1,7 @@
 cd readthedocs
-DJANGO_SETTINGS_MODULE=settings.test ./manage.py test --logging-clear-handlers ./
+export PYTHONPATH=`pwd`:$PYTHONPATH
+export DJANGO_SETTINGS_MODULE=settings.test
+py.test
 exit=$?
 cd -
 exit $exit