diff options
| author | Vladislav Poluhin | 2013-04-24 16:51:46 +0800 |
|---|---|---|
| committer | Vladislav Poluhin | 2013-04-24 16:51:46 +0800 |
| commit | f386dd03ab05108488f7428cf64bd9bf382ae579 (patch) | |
| tree | 71a4ff8399ef3f4879a748836b9921b9873e4c9e | |
| parent | 702f574461693efe0ea951254e2dcce7edb9a30f (diff) | |
| parent | 49c09c0b9afb588fa3cde047075331ea81d18a55 (diff) | |
| download | django-debug-toolbar-f386dd03ab05108488f7428cf64bd9bf382ae579.tar.bz2 | |
Merge branch 'master' of https://github.com/django-debug-toolbar/django-debug-toolbar into sql-panel-refactor
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | setup.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 6e0da0a..c5385b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,7 @@ python: env: - DJANGO_VERSION=1.3.7 - DJANGO_VERSION=1.4.5 - - DJANGO_VERSION=1.5 + - DJANGO_VERSION=1.5.1 install: - pip install Django==$DJANGO_VERSION - - python setup.py install script: python setup.py test @@ -13,7 +13,7 @@ setup( license='BSD', packages=find_packages(exclude=('tests', 'example')), tests_require=[ - 'django>=1.3,<1.5', + 'django>=1.3,<1.6', ], test_suite='runtests.runtests', include_package_data=True, |