From patchwork Fri Aug 26 06:04:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Axtens X-Patchwork-Id: 662995 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sL9VK0Dbyz9sBg for ; Fri, 26 Aug 2016 16:04:25 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=axtens.net header.i=@axtens.net header.b=iL7ivzbp; dkim-atps=neutral Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3sL9VJ6FFkzDrdG for ; Fri, 26 Aug 2016 16:04:24 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=axtens.net header.i=@axtens.net header.b=iL7ivzbp; dkim-atps=neutral X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Received: from mail-pa0-x241.google.com (mail-pa0-x241.google.com [IPv6:2607:f8b0:400e:c03::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3sL9VC0BNxzDrK1 for ; Fri, 26 Aug 2016 16:04:18 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axtens.net header.i=@axtens.net header.b=iL7ivzbp; dkim-atps=neutral Received: by mail-pa0-x241.google.com with SMTP id ez1so4200192pab.3 for ; Thu, 25 Aug 2016 23:04:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axtens.net; s=google; h=from:to:cc:subject:date:message-id; bh=m6ceAP6Ns69pn9jsHanAmyhkl0jlUSt8fAWsmskljYE=; b=iL7ivzbptzHRn1XAtxykdf8PEV1qH6AWMfmOMplRlg7VFCgkK19rHCW66NthbLe9HU OfSTg4C8QbPmBK6tZroMorROH/uualL+GmNz6fwr7k68jb8PEX/zV3r/ecayox0DUUfV vRI4twshPdhwXbsSZ7YaYeNjPjGsn/SoctvIQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=m6ceAP6Ns69pn9jsHanAmyhkl0jlUSt8fAWsmskljYE=; b=HhY2xnI2YQlzIRjJDzV9KL8xwIgK2KJPxhtdyI/ajWPyyfc3p6KRZ+qeEp1tWb6kfv 0ny3yZF/e4Tz6BX0dI3svC/13OBWVL8YVcfmpPx1h1nC3UDh86pp/R9HXBzsEH+xP/9N 83aJnjFGEC1qybO2WGc9GuVVw79w08DTGcNbaMtI+neP3r7hy+ULCTyiqzbX5IE4Ly4V c9peKvt2Ai5pRQwvZICqgsQ4fN2K0duV0wMFf+J8ivAeXLo7b5euoNPJxCEw+vF3cIUE 0myTRJOvSlkd2bl3rlSBnJtQWLgGn03bD/d5NPzlDw10wlclvI4NAYG9zxyMdv8nlcJb XvWg== X-Gm-Message-State: AE9vXwPaHlZQuNd6beF7mLpA/dFIYxVu80R67Kuuf3expGRIqu/BU6wq7ntxQmsAx+IC3w== X-Received: by 10.67.1.35 with SMTP id bd3mr2879416pad.16.1472191456234; Thu, 25 Aug 2016 23:04:16 -0700 (PDT) Received: from possimpible.ozlabs.ibm.com (ppp121-45-195-151.lns20.cbr1.internode.on.net. [121.45.195.151]) by smtp.gmail.com with ESMTPSA id c64sm25091122pfg.35.2016.08.25.23.04.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Aug 2016 23:04:15 -0700 (PDT) From: Daniel Axtens To: patchwork@lists.ozlabs.org Subject: [PATCH v3] Move django-debug-toolbar to requirements-dev.txt Date: Fri, 26 Aug 2016 16:04:01 +1000 Message-Id: <1472191441-25991-1-git-send-email-dja@axtens.net> X-Mailer: git-send-email 2.7.4 X-BeenThere: patchwork@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Patchwork development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Patchwork" Don't install django-debug-toolbar as part of test requirements, but as part of dev requirements. Also, install the current version (1.5). Not testing with django-debug-toolbar makes sense, and also avoids a nasty dependency conflict between it, sqlparse and older versions of Django. Reviewed-by: Andrew Donnellan Signed-off-by: Daniel Axtens --- v2: fix flake v3: changes from Andrew Donnellan, reworded commit message --- patchwork/settings/dev.py | 34 +++++++++++++++++++--------------- requirements-dev.txt | 1 + requirements-test.txt | 2 +- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/patchwork/settings/dev.py b/patchwork/settings/dev.py index b78a0bfeb0c8..40cb98a3b8b4 100644 --- a/patchwork/settings/dev.py +++ b/patchwork/settings/dev.py @@ -66,21 +66,25 @@ PASSWORD_HASHERS = ['django.contrib.auth.hashers.MD5PasswordHasher'] # django-debug-toolbar if django.VERSION >= (1, 7): - INSTALLED_APPS += [ - 'debug_toolbar' - ] - - DEBUG_TOOLBAR_PATCH_SETTINGS = False - - # This should go first in the middleware classes - MIDDLEWARE_CLASSES = [ - 'debug_toolbar.middleware.DebugToolbarMiddleware', - ] + MIDDLEWARE_CLASSES - - INTERNAL_IPS = [ - '127.0.0.1', '::1', - '172.17.0.1' - ] + try: + import debug_toolbar # noqa + INSTALLED_APPS += [ + 'debug_toolbar' + ] + + DEBUG_TOOLBAR_PATCH_SETTINGS = False + + # This should go first in the middleware classes + MIDDLEWARE_CLASSES = [ + 'debug_toolbar.middleware.DebugToolbarMiddleware', + ] + MIDDLEWARE_CLASSES + + INTERNAL_IPS = [ + '127.0.0.1', '::1', + '172.17.0.1' + ] + except ImportError: + pass # diff --git a/requirements-dev.txt b/requirements-dev.txt index d44ebc697bed..947c8d32744e 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,2 +1,3 @@ Django>=1.8,<1.10 +django-debug-toolbar==1.5 -r requirements-test.txt diff --git a/requirements-test.txt b/requirements-test.txt index cfc242f647f8..1e235905d9df 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,6 +1,6 @@ mysqlclient==1.3.7 # replace this with psycopg2 for a PostgreSQL backend -django-debug-toolbar==1.4 python-dateutil>2.0,<3.0 selenium>2.0,<3.0 djangorestframework>=3.3,<3.4 drf-nested-routers>=0.11.1,<0.12 +sqlparse>=0.2.1,<0.3