aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml9
-rw-r--r--README.rst2
-rw-r--r--docs/conf.py2
-rw-r--r--setup.py4
-rw-r--r--tox.ini8
5 files changed, 13 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml
index a39532b..b332964 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,14 +5,15 @@ python:
- "3.2"
- "3.3"
env:
- - DJANGO_VERSION=1.4.8
- - DJANGO_VERSION=1.5.4
+ - DJANGO_VERSION=1.4.10
+ - DJANGO_VERSION=1.5.5
+ - DJANGO_VERSION=1.6
matrix:
exclude:
- python: "3.2"
- env: DJANGO_VERSION=1.4.8
+ env: DJANGO_VERSION=1.4.10
- python: "3.3"
- env: DJANGO_VERSION=1.4.8
+ env: DJANGO_VERSION=1.4.10
install:
- pip install Django==$DJANGO_VERSION sqlparse
script: make test
diff --git a/README.rst b/README.rst
index 37e4ed1..1a1874a 100644
--- a/README.rst
+++ b/README.rst
@@ -19,7 +19,7 @@ Here's a screenshot of the toolbar in action:
In addition to the built-in panels, a number of third-party panels are
contributed by the community.
-The current version of the Debug Toolbar is 0.10.2. It works on Django 1.4,
+The current version of the Debug Toolbar is 0.11.0. It works on Django 1.4,
1.5 and 1.6.
If you're using Django 1.4, you will need Django ≥ 1.4.2 and Python ≥ 2.6.5.
diff --git a/docs/conf.py b/docs/conf.py
index a6da032..ccc8e0a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -56,7 +56,7 @@ copyright = u'2013, Rob Hudson, Jannis Leidel, David Cramer, Aymeric Augustin an
# The short X.Y version.
version = '0.10'
# The full version, including alpha/beta/rc tags.
-release = '0.10.2'
+release = '0.11.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.py b/setup.py
index f9258e8..a9516d0 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
setup(
name='django-debug-toolbar',
- version='0.10.2',
+ version='0.11.0',
description='A configurable set of panels that display various debug '
'information about the current request/response.',
long_description=open('README.rst').read(),
@@ -13,7 +13,7 @@ setup(
license='BSD',
packages=find_packages(exclude=('tests', 'example')),
install_requires=[
- 'django>=1.4.2,<1.6',
+ 'django>=1.4.2,<1.7',
'sqlparse',
],
include_package_data=True,
diff --git a/tox.ini b/tox.ini
index 8a6caa9..b7fb6f0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -57,25 +57,25 @@ deps =
[testenv:py26-django16]
basepython = python2.6
deps =
- https://www.djangoproject.com/download/1.6c1/tarball/
+ Django>=1.6,<1.7
{[testenv]deps}
[testenv:py27-django16]
basepython = python2.7
deps =
- https://www.djangoproject.com/download/1.6c1/tarball/
+ Django>=1.6,<1.7
{[testenv]deps}
[testenv:py32-django16]
basepython = python3.2
deps =
- https://www.djangoproject.com/download/1.6c1/tarball/
+ Django>=1.6,<1.7
{[testenv]deps}
[testenv:py33-django16]
basepython = python3.3
deps =
- https://www.djangoproject.com/download/1.6c1/tarball/
+ Django>=1.6,<1.7
{[testenv]deps}
[testenv:flake8]