fixes missing import-export import error int tests

Author: saxix

.travis.yml

@@ -15,6 +15,7 @@ env:
   - DJANGO="https://www.djangoproject.com/download/1.6a1/tarball/" DBENGINE=pg
 
 install:
+  - pip install -r demo/demoproject/requirements.pip
   - pip install -r requirements.pip
   - sh -c "if [ '$DBENGINE' = 'pg' ]; then pip install -q psycopg2; fi"
   - sh -c "if [ '$DBENGINE' = 'mysql' ]; then pip install -q MySQL-python; fi"

demo/demoproject/demoapp/fixtures/demoapp.json

@@ -0,0 +1 @@
+[{"pk": 1, "model": "demoapp.demomodel", "fields": {"char": "aa1", "integer": 1, "version": 1371221369533415}}, {"pk": 2, "model": "demoapp.demomodel", "fields": {"char": "bb41111111122aaa", "integer": 2, "version": 1371221369413696}}, {"pk": 3, "model": "demoapp.demomodel", "fields": {"char": "11", "integer": 11, "version": 1371221369252343}}]

demo/demoproject/demoapp/tests.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-import StringIO
+from six import StringIO
 import os
 from django.utils.translation import gettext as _
 from django.contrib.auth.models import User

demo/demoproject/requirements.pip

@@ -0,0 +1 @@
+django-import-export

demo/demoproject/settings.py

@@ -7,7 +7,7 @@
 SITE_ID = 1
 ROOT_URLCONF = 'demoproject.urls'
 SECRET_KEY = ';klkj;okj;lkn;lklj;lkj;kjmlliuewhy2ioqwjdkh'
-INSTALLED_APPS = (
+INSTALLED_APPS = [
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
@@ -16,9 +16,13 @@
     'django.contrib.staticfiles',
     'django.contrib.admin',
     'concurrency',
-    'import_export',
     'demoproject.demoapp'
-)
+]
+try:
+    import import_export
+    INSTALLED_APPS.append('import_export')
+except ImportError:
+    pass
 
 TEMPLATE_DIRS = ['demoproject/templates']
 from demoproject.settings_sqlite import *  # NOQA

docs/install.rst

@@ -46,6 +46,7 @@ Option 2: using demo project
     ::
 
         $ cd demo
+        $ pip install -r demoproject/requirements.pip
         $ ./manage.py test adminactions
 
 Option 3: execute in your project

tox.ini

@@ -21,7 +21,8 @@ changedir=tests
 setenv =
     PYTHONPATH = {toxinidir}/demo
 commands =
-    django-admin.py test concurrency --settings demoproject.settings --failfast --traceback
+    pip install -r {toxinidir}/demo/demoproject/requirements.pip
+    django-admin.py test concurrency demoapp --settings demoproject.settings --failfast --traceback
 
 [testenv:d14]
 basepython = python2.7