From 6a3ec6a167ccd9884f1820d66571a0946efedf0d Mon Sep 17 00:00:00 2001 From: "mikhail.main" Date: Sun, 22 Nov 2015 00:12:29 +1200 Subject: [PATCH 1/3] Delete "{% load url from future %}" tags for work with django-1.9. --- import_export/templates/admin/import_export/base.html | 1 - import_export/templates/admin/import_export/export.html | 1 - import_export/templates/admin/import_export/import.html | 1 - 3 files changed, 3 deletions(-) diff --git a/import_export/templates/admin/import_export/base.html b/import_export/templates/admin/import_export/base.html index a1b463763..bf35a3f0b 100644 --- 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 }}{% 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 index 009e7762b..80f073be0 100644 --- 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 index 538c588c4..fa0d04cf7 100644 --- 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 %} From 6147a8e65c0c7caed84520ddd523c239e183ba67 Mon Sep 17 00:00:00 2001 From: mikhailmain Date: Mon, 23 Nov 2015 21:49:51 +1200 Subject: [PATCH 2/3] Remove django-1.4 mentions. --- .travis.yml | 3 +-- README.rst | 2 +- requirements/base.txt | 2 +- tox.ini | 21 +-------------------- 4 files changed, 4 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index e4c173b9e..83ccb9e2a 100644 --- 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 index b90afdb6e..e8c98dbcd 100644 --- 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 index 0b1927d58..bc56ae8c6 100644 --- 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 index 031723c13..d3c44d26b 100644 --- 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 = From c649eb19d8fe50a78dd4b9f90ed694f84f0e6303 Mon Sep 17 00:00:00 2001 From: mikhailmain Date: Mon, 23 Nov 2015 22:47:44 +1200 Subject: [PATCH 3/3] Add django-1.4 not supported item to changelog. --- docs/changelog.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 38439f873..aca8fb1fa 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -4,7 +4,7 @@ Changelog for django-import-export 0.3 (unreleased) ---------------- -- Nothing changed yet. +- Django 1.4 is not supported (#348) 0.2.9 (2015-11-12)