| Message ID | BLU437-SMTP5352646BABE8DDB4729355A3E10@phx.gbl |
|---|---|
| State | Accepted |
| Headers | show |
On 30 Aug 00:38, Stephen Finucane wrote: > This is the latest version. This breaks compatibility with Django 1.7, > but this version is unsupported and should not be used for development. > We do, however, continue to test support for Django 1.7 and 1.6. > > This also prevents the need to manually track sqlparse dependency [1]. > > [1] https://github.com/jazzband/django-debug-toolbar/issues/856 > > Signed-off-by: Stephen Finucane <stephenfinucane@hotmail.com> > --- > v2: > - Disable for Django < 1.8 via settings All unit tests pass with this patch, and it's simpler than the alternatives. Merged. Stephen
diff --git a/patchwork/settings/dev.py b/patchwork/settings/dev.py index b78a0bf..60f52b1 100644 --- a/patchwork/settings/dev.py +++ b/patchwork/settings/dev.py @@ -65,7 +65,7 @@ PASSWORD_HASHERS = ['django.contrib.auth.hashers.MD5PasswordHasher'] # django-debug-toolbar -if django.VERSION >= (1, 7): +if django.VERSION >= (1, 8): INSTALLED_APPS += [ 'debug_toolbar' ] diff --git a/requirements-test.txt b/requirements-test.txt index cfc242f..47c85b1 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,5 +1,5 @@ mysqlclient==1.3.7 # replace this with psycopg2 for a PostgreSQL backend -django-debug-toolbar==1.4 +django-debug-toolbar==1.5 python-dateutil>2.0,<3.0 selenium>2.0,<3.0 djangorestframework>=3.3,<3.4
This is the latest version. This breaks compatibility with Django 1.7, but this version is unsupported and should not be used for development. We do, however, continue to test support for Django 1.7 and 1.6. This also prevents the need to manually track sqlparse dependency [1]. [1] https://github.com/jazzband/django-debug-toolbar/issues/856 Signed-off-by: Stephen Finucane <stephenfinucane@hotmail.com> --- v2: - Disable for Django < 1.8 via settings --- patchwork/settings/dev.py | 2 +- requirements-test.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)