From c804c395ed293048c4e52ccd0717812c2438a73a Mon Sep 17 00:00:00 2001
From: Axel Haustant <noirbizarre@gmail.com>
Date: Tue, 28 Apr 2015 20:31:13 +0200
Subject: [PATCH] Post rebase and Django removal tuning (and prepare for
 PyMongo 3)

---
 .travis.yml | 31 ++++++-------------------------
 README.rst  |  3 +--
 tox.ini     | 10 ++--------
 3 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 46a71a2f..74f40929 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,30 +8,11 @@ python:
 - pypy
 - pypy3
 env:
-- PYMONGO=2.7 DJANGO=dev
-- PYMONGO=2.7 DJANGO=1.8
-- PYMONGO=2.7 DJANGO=1.7
-- PYMONGO=2.7 DJANGO=1.6
-- PYMONGO=2.7 DJANGO=1.5
-- PYMONGO=2.8 DJANGO=dev
-- PYMONGO=2.8 DJANGO=1.8
-- PYMONGO=2.8 DJANGO=1.7
-- PYMONGO=2.8 DJANGO=1.6
-- PYMONGO=2.8 DJANGO=1.5
+- PYMONGO=2.7
+- PYMONGO=2.8
+# - PYMONGO=3.0
+# - PYMONGO=dev
 matrix:
-  exclude:
-  - python: '2.6'
-    env: PYMONGO=2.7 DJANGO=dev
-  - python: '2.6'
-    env: PYMONGO=2.8
-  - python: '2.6'
-    env: PYMONGO=2.7 DJANGO=1.7
-  - python: '2.6'
-    env: PYMONGO=2.8 DJANGO=1.7
-  - python: '2.6'
-    env: PYMONGO=2.7 DJANGO=1.8
-  - python: '2.6'
-    env: PYMONGO=2.8 DJANGO=1.8
   fast_finish: true
 before_install:
 - travis_retry sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
@@ -44,9 +25,9 @@ install:
   libtiff4-dev libjpeg8-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev
   python-tk
 - travis_retry pip install tox>=1.9 coveralls
-- travis_retry tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO-dj$DJANGO | tr -d . | sed -e 's/pypypy/pypy/') -- -e test
+- travis_retry tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -e test
 script:
-- tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO-dj$DJANGO | tr -d . | sed -e 's/pypypy/pypy/') -- --with-coverage
+- tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- --with-coverage
 after_script: coveralls --verbose
 notifications:
   irc: irc.freenode.org#mongoengine
diff --git a/README.rst b/README.rst
index 5a873e22..2d17313f 100644
--- a/README.rst
+++ b/README.rst
@@ -38,12 +38,11 @@ Dependencies
 
 Optional Dependencies
 ---------------------
-- **Django Integration:** Django>=1.4.0 for Python 2.x or PyPy and Django>=1.5.0 for Python 3.x
 - **Image Fields**: Pillow>=2.0.0
 - dateutil>=2.1.0
 
 .. note
-   MongoEngine always runs it's test suite against the latest patch version of each dependecy. e.g.: Django 1.6.5
+   MongoEngine always runs it's test suite against the latest patch version of each dependecy. e.g.: PyMongo 3.0.1
 
 Examples
 ========
diff --git a/tox.ini b/tox.ini
index 38517bdc..3f69b5e8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,6 @@
 [tox]
-envlist =
-    {py27,py32,py33,py34,pypy,pypy3}-{mg27,mg28,mg30}-{dj15,dj16,dj17,dj18,djdev},
-    py26-{mg27,mg28,mg30}-{dj15,dj16}
+envlist = {py26,py27,py32,py33,py34,pypy,pypy3}-{mg27,mg28}
+#envlist = {py26,py27,py32,py33,py34,pypy,pypy3}-{mg27,mg28,mg30,mgdev}
 
 [testenv]
 commands =
@@ -11,8 +10,3 @@ deps =
     mg28: PyMongo>=2.8,<3.0
     mg30: PyMongo>=3.0
     mgdev: https://github.com/mongodb/mongo-python-driver/tarball/master
-    dj15: Django<1.6
-    dj16: Django>=1.6,<1.7
-    dj17: Django>=1.7,<1.8
-    dj18: Django>=1.8,<1.9
-    djdev: https://github.com/django/django/tarball/master