From 894e7b1b2e65b3b9d36ec981c39a3352826b75de Mon Sep 17 00:00:00 2001
From: Patrick Altman <paltman@gmail.com>
Date: Mon, 15 Dec 2014 16:20:05 -0600
Subject: [PATCH] Upgrade requirements

---
 requirements-test.txt | 11 -----------
 requirements/base.txt | 23 ++++++++++++-----------
 2 files changed, 12 insertions(+), 22 deletions(-)
 delete mode 100644 requirements-test.txt

diff --git a/requirements-test.txt b/requirements-test.txt
deleted file mode 100644
index 2ebbf3b6..00000000
--- a/requirements-test.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Django==1.4.15
-Pillow==2.5.3
-django-discover-runner==1.0
-django-markitup==2.2.2
-django-model-utils==1.5.0
-django-nose==1.2
-django-reversion==1.8.0
-django-timezones==0.2
-factory-boy==2.4.1
-nose==1.3.4
-pytz==2014.7
diff --git a/requirements/base.txt b/requirements/base.txt
index b503a4ba..fd5fd582 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,13 +1,14 @@
-Django>=1.5,<=1.6
-django-appconf==0.5
+Django>=1.6,<=1.7.1
+django-appconf==0.6
 django-forms-bootstrap>=2.0.3.post2
-django-markitup==2.1
-django-model-utils==2.0.2
-django-reversion==1.8
-django-sitetree==1.0.0
-django-taggit==0.11.2
+django-markitup==2.2.2
+django-model-utils==2.2
+django-reversion==1.8.5
+django-sitetree==1.2.1
+django-taggit==0.12.2
 django-timezones==0.2
-django-user-accounts==1.0b13
-easy-thumbnails==1.4
-html5lib==0.95
-markdown==2.3.1
+django-user-accounts==1.0
+easy-thumbnails==2.2
+html5lib==0.999
+markdown==2.5.2
+pytz==2014.10