From bafdf0381adbfa2f9a626d5d0ad4720366af3a03 Mon Sep 17 00:00:00 2001
From: Ross Lawley <ross.lawley@gmail.com>
Date: Thu, 25 Apr 2013 11:59:56 +0000
Subject: [PATCH] Updates

---
 .travis.yml      | 6 ++++++
 docs/upgrade.rst | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index e78bda5a..c5fe62ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,12 @@ env:
   - PYMONGO=2.5 DJANGO=1.5.1
   - PYMONGO=2.5 DJANGO=1.4.2
   - PYMONGO=2.4.2 DJANGO=1.4.2
+matrix:
+  exclude:
+    - python: "2.6"
+      env: PYMONGO=dev DJANGO=1.5.1
+    - python: "2.6"
+      env: PYMONGO=2.5 DJANGO=1.5.1
 install:
     - if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then cp /usr/lib/*/libz.so $VIRTUAL_ENV/lib/; fi
     - if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then pip install pil --use-mirrors ; true; fi
diff --git a/docs/upgrade.rst b/docs/upgrade.rst
index 738a949b..6138bb45 100644
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -15,6 +15,11 @@ possible for the whole of the release.
     live. There maybe multiple manual steps in migrating and these are best honed
     on a staging / test system.
 
+Python
+=======
+
+Support for python 2.5 has been dropped.
+
 Data Model
 ==========