Remove django-1.4 mentions.

freelancersunion · Nov 23, 2015 · 6147a8e · 6147a8e
1 parent 6a3ec6a
commit 6147a8e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,6 @@ python:
   - "3.3"
   - "3.4"
 env:
-  - DJANGO=1.4.10
   - DJANGO=1.5.5
   - DJANGO=1.6.1
   - DJANGO=1.7.0
@@ -14,4 +13,4 @@ install:
   - pip install -e git+https://github.com/kennethreitz/tablib.git#egg=tablib
   - pip install -r requirements/base.txt --use-mirrors
 script:
-  - if [[ ($TRAVIS_PYTHON_VERSION != '3.3' && $TRAVIS_PYTHON_VERSION != '3.4') || $DJANGO != "1.4.10" ]]; then python tests/manage.py test core --settings=settings; fi
+  - python tests/manage.py test core --settings=settings
diff --git a/README.rst b/README.rst
@@ -37,7 +37,7 @@ Requirements
 -----------
 
 * Python 2.7+ or Python 3.3+
-* Django 1.4.2+
+* Django 1.5.3+
 * tablib (dev or 0.9.11)
 
 Example app

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -1,3 +1,3 @@
-Django>=1.4
+Django>=1.5
 tablib
 diff-match-patch
diff --git a/tox.ini b/tox.ini
@@ -1,28 +1,9 @@
 [tox]
-envlist = py27-1.4, py27-tablib-dev-1.4, py27-mysql-innodb-1.4, py27-1.5, py27-1.6, py33-1.6, py27-1.7, py33-1.7, py34-1.7, py27-1.8, py33-1.8, py34-1.8
+envlist = py27-1.5, py27-1.6, py33-1.6, py27-1.7, py33-1.7, py34-1.7, py27-1.8, py33-1.8, py34-1.8
 
 [testenv]
 commands=python {toxinidir}/tests/manage.py test core
 
-[testenv:py27-1.4]
-basepython = python2.7
-deps = 
-    django==1.4.10
-
-[testenv:py27-tablib-dev-1.4]
-basepython = python2.7
-deps = 
-    django==1.4.10
-    -egit+https://github.com/kennethreitz/tablib.git#egg=tablib
-
-[testenv:py27-mysql-innodb-1.4]
-basepython = python2.7
-deps = 
-    django==1.4.10
-    mysql-python
-setenv =
-    IMPORT_EXPORT_TEST_TYPE=mysql-innodb
-
 [testenv:py27-1.5]
 basepython = python2.7
 deps =