diff options
| author | Carlton Gibson <carlton.gibson@noumenal.co.uk> | 2015-11-01 15:03:51 +0100 |
|---|---|---|
| committer | Carlton Gibson <carlton.gibson@noumenal.co.uk> | 2015-11-01 15:03:51 +0100 |
| commit | 41288c98e115673e814b3420b7755e9fc1187c3f (patch) | |
| tree | f48392b7b583421ecc29f6639a4f207cf482605e | |
| parent | fe126b4432c1b8237254013e10ab0623cb793cba (diff) | |
| parent | 6ceec37832534b33a37f6f7b99436bf26a71d4a1 (diff) | |
| download | django-appconf-41288c98e115673e814b3420b7755e9fc1187c3f.tar.gz | |
Merge pull request #28 from wtayyeb/patch-1
use django.utils.six instead of standalone six
| -rw-r--r-- | appconf/base.py | 3 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | tox.ini | 3 |
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 @@ -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', @@ -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 |