summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--appconf/base.py3
-rw-r--r--setup.py2
-rw-r--r--tox.ini3
3 files changed, 4 insertions, 4 deletions
diff --git a/appconf/base.py b/appconf/base.py
index f910e56..f07def0 100644
--- a/appconf/base.py
+++ b/appconf/base.py
@@ -1,8 +1,7 @@
import sys
-import six
-
from django.core.exceptions import ImproperlyConfigured
+from django.utils import six
from .utils import import_attribute
diff --git a/setup.py b/setup.py
index b5f57f9..e80e47f 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,7 @@ setup(
license='BSD',
url='http://django-appconf.readthedocs.org/',
packages=['appconf'],
- install_requires=['six'],
+ install_requires=[],
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment',
diff --git a/tox.ini b/tox.ini
index 3a37f50..2a631a2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,7 +24,8 @@ setenv =
DJANGO_SETTINGS_MODULE=tests.test_settings
deps =
flake8
- coverage
+ py{26,27,33,34,35,pypy}: coverage
+ py32: coverage==3.7.1 # latest coverage support py3.2
django-discover-runner
dj13: https://github.com/django/django/archive/stable/1.3.x.zip#egg=django
dj14: https://github.com/django/django/archive/stable/1.4.x.zip#egg=django