Merge branch 'master' of https://github.com/mikhailmain/django-import…

…-export into mikhailmain-master
freelancersunion · Dec 2, 2015 · 67234b4 · 67234b4
2 parents 33487df + c649eb1
commit 67234b4
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 28 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/docs/changelog.rst b/docs/changelog.rst
@@ -4,7 +4,7 @@ Changelog for django-import-export
 0.3.2 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Django 1.4 is not supported (#348)
 
 
 0.3.1 (2015-11-20)

diff --git a/import_export/templates/admin/import_export/base.html b/import_export/templates/admin/import_export/base.html
@@ -1,7 +1,6 @@
 {% extends "admin/base_site.html" %}
 {% load i18n admin_static admin_modify %}
 {% load admin_urls %}
-{% load url from future %}
 
 {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}" />{% endblock %}
 {% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %}

diff --git a/import_export/templates/admin/import_export/export.html b/import_export/templates/admin/import_export/export.html
@@ -1,5 +1,4 @@
 {% extends "admin/import_export/base.html" %}
-{% load url from future %}
 {% load i18n %}
 {% load admin_urls %}
 {% load import_export_tags %}

diff --git a/import_export/templates/admin/import_export/import.html b/import_export/templates/admin/import_export/import.html
@@ -1,5 +1,4 @@
 {% extends "admin/import_export/base.html" %}
-{% load url from future %}
 {% load i18n %}
 {% load admin_urls %}
 {% load import_export_tags %}

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 =