From patchwork Thu Aug 27 14:14:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Donnellan X-Patchwork-Id: 1352600 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BclFm044tz9sRK for ; Fri, 28 Aug 2020 00:18:36 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=LDy1MMxd; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4BclFl4chxzDqH5 for ; Fri, 28 Aug 2020 00:18:35 +1000 (AEST) X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linux.ibm.com (client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com; envelope-from=ajd@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=LDy1MMxd; dkim-atps=neutral Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Bcl953sMHzDqck for ; Fri, 28 Aug 2020 00:14:31 +1000 (AEST) Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 07RE2gUh097195 for ; Thu, 27 Aug 2020 10:14:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : subject : date : message-id : mime-version : content-transfer-encoding; s=pp1; bh=AMYEztGXYFOD7kU+Zf5T9m9fJyyl3wePhM8Ci8JQgyA=; b=LDy1MMxdy1G9igLIYM0QobHj6CrUcJyoDe9do7arvncyVcpM793ctxkq0nWFOw2pju/+ tMQpX4LYWZZZglIvqCz/I8/AyImpEW6QPpTUUPz7puo5CRbr/4NH7v2QEeWzO3uy7Axp B6xcavVU1gVzAtVnTGUhc2OSAXwIJkeDTJjqDbrd9PQBFLeeECFBeMrPPJrIk87RxHOa ZsIAFMFaKZt5Ozn6NDpnkmOWI805crxU4sVusePXGDefhFdMTZU2So5MM/7uCeWCsRkl uKHf9tcLvy9jHNPqkMr2Uee0OXzkEesFC408T81q2yBpxQu+2fmXp9J+SFr2hRo3vHCl xQ== Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0a-001b2d01.pphosted.com with ESMTP id 336djj1yht-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 27 Aug 2020 10:14:29 -0400 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 07RECZ2F013296 for ; Thu, 27 Aug 2020 14:14:26 GMT Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by ppma06ams.nl.ibm.com with ESMTP id 332uk6ds28-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 27 Aug 2020 14:14:26 +0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 07REEOH023265646 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 27 Aug 2020 14:14:24 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1B8B55204E for ; Thu, 27 Aug 2020 14:14:24 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id 6CE2752054 for ; Thu, 27 Aug 2020 14:14:23 +0000 (GMT) Received: from intelligence.ibm.com (unknown [9.81.217.160]) (using TLSv1.2 with cipher DHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id DE32FA0226 for ; Fri, 28 Aug 2020 00:14:21 +1000 (AEST) From: Andrew Donnellan To: patchwork@lists.ozlabs.org Subject: [PATCH 1/5] templates: Replace ifequal and ifnotequal with if Date: Fri, 28 Aug 2020 00:14:02 +1000 Message-Id: <20200827141406.18231-1-ajd@linux.ibm.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687 definitions=2020-08-27_07:2020-08-27, 2020-08-27 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 impostorscore=0 lowpriorityscore=0 bulkscore=0 mlxlogscore=636 malwarescore=0 spamscore=0 phishscore=0 clxscore=1015 suspectscore=1 priorityscore=1501 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2008270103 X-BeenThere: patchwork@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Patchwork development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Patchwork" Django 3.1 deprecates the ifequal and ifnotequal tags, for removal in 4.0. Replace all occurrences of ifequal and ifnotequal with if. Signed-off-by: Andrew Donnellan Reviewed-by: Stephen Finucane --- .../patchwork/partials/pagination.html | 8 ++++---- .../patchwork/partials/patch-list.html | 20 +++++++++---------- patchwork/templates/patchwork/profile.html | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/patchwork/templates/patchwork/partials/pagination.html b/patchwork/templates/patchwork/partials/pagination.html index 04f4d16671c2..ee4b555d62c2 100644 --- a/patchwork/templates/patchwork/partials/pagination.html +++ b/patchwork/templates/patchwork/partials/pagination.html @@ -1,6 +1,6 @@ {% load listurl %} -{% ifnotequal page.paginator.num_pages 1 %} +{% if page.paginator.num_pages != 1 %}
{% if page.has_previous %} @@ -18,12 +18,12 @@ {% endif %} {% for p in page.paginator.adjacent_set %} - {% ifequal p page.number %} + {% if p == page.number %} {{ p }} {% else %} {{ p }} - {% endifequal %} + {% endif %} {% endfor %} {% if page.paginator.leading_set %} @@ -42,4 +42,4 @@ » {% endif %}
-{% endifnotequal %} +{% endif %} diff --git a/patchwork/templates/patchwork/partials/patch-list.html b/patchwork/templates/patchwork/partials/patch-list.html index 985e9bee05a0..02d6dff87c97 100644 --- a/patchwork/templates/patchwork/partials/patch-list.html +++ b/patchwork/templates/patchwork/partials/patch-list.html @@ -71,7 +71,7 @@ $(document).ready(function() { {% endif %} - {% ifequal order.name "name" %} + {% if order.name == "name" %} @@ -84,7 +84,7 @@ $(document).ready(function() { {% else %} Patch {% endif %} - {% endifequal %} + {% endif %} @@ -100,7 +100,7 @@ $(document).ready(function() { - {% ifequal order.name "date" %} + {% if order.name == "date" %} @@ -113,11 +113,11 @@ $(document).ready(function() { {% else %} Date {% endif %} - {% endifequal %} + {% endif %} - {% ifequal order.name "submitter" %} + {% if order.name == "submitter" %} @@ -132,11 +132,11 @@ $(document).ready(function() { {% else %} Submitter {% endif %} - {% endifequal %} + {% endif %} - {% ifequal order.name "delegate" %} + {% if order.name == "delegate" %} @@ -149,11 +149,11 @@ $(document).ready(function() { {% else %} Delegate {% endif %} - {% endifequal %} + {% endif %} - {% ifequal order.name "state" %} + {% if order.name == "state" %} @@ -166,7 +166,7 @@ $(document).ready(function() { {% else %} State {% endif %} - {% endifequal %} + {% endif %} diff --git a/patchwork/templates/patchwork/profile.html b/patchwork/templates/patchwork/profile.html index 4ca78dae430e..4a4b55826d03 100644 --- a/patchwork/templates/patchwork/profile.html +++ b/patchwork/templates/patchwork/profile.html @@ -55,13 +55,13 @@ address.

{{ email.email }} - {% ifnotequal user.email email.email %} + {% if user.email != email.email %}
{% csrf_token %}
- {% endifnotequal %} + {% endif %} {% if email.is_optout %} From patchwork Thu Aug 27 14:14:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Donnellan X-Patchwork-Id: 1352599 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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BclF14Yqsz9sSJ for ; Fri, 28 Aug 2020 00:17:57 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=E0TMIw/w; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4BclF13Y9szDqcn for ; Fri, 28 Aug 2020 00:17:57 +1000 (AEST) X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linux.ibm.com (client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com; envelope-from=ajd@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=E0TMIw/w; dkim-atps=neutral Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Bcl963SblzDqcq for ; Fri, 28 Aug 2020 00:14:33 +1000 (AEST) Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 07RECrUm057048 for ; Thu, 27 Aug 2020 10:14:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=muUFd6/GrnowPjyy70Kyvvz6JWP1Vu24znfeR9+84mc=; b=E0TMIw/wH1m5BL8wg/9V3fiJd5oH0y4TBzjqmSHZgenTVmkzRBbefn/KhruGG+sblqV8 JPupCZ8WLGFK+oqmAdr0alkrx7uz+08+BxV5nqqA/EqB9kGbIlqpfhmKXDxmsLHZA9By TocBgauLsagMpZHO9sjqjgEq4CsuzV6HBrXBqetLUk07gQEWMbwunGqqJjONYp/taUSQ e5+PVf53Buw19VQRZRwBL3CN1qUSgetMwWDbWh6LSaEdondiTDDNGbhWdJu5mbYKTSMg umIEOUJAUZsou1Ok/0S1XVXM7RbwwBLm47qGlHbfl1dbIGsxArU056yhLruUAU7IgbRf zA== Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0b-001b2d01.pphosted.com with ESMTP id 336ed3g11k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 27 Aug 2020 10:14:28 -0400 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 07RECeDb013308 for ; Thu, 27 Aug 2020 14:14:26 GMT Received: from b06avi18626390.portsmouth.uk.ibm.com (b06avi18626390.portsmouth.uk.ibm.com [9.149.26.192]) by ppma06ams.nl.ibm.com with ESMTP id 332uk6ds29-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 27 Aug 2020 14:14:26 +0000 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06avi18626390.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 07RECrBo66585058 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 27 Aug 2020 14:12:53 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 64F5311C04A for ; Thu, 27 Aug 2020 14:14:24 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7790111C052 for ; Thu, 27 Aug 2020 14:14:23 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTP for ; Thu, 27 Aug 2020 14:14:23 +0000 (GMT) Received: from intelligence.ibm.com (unknown [9.81.217.160]) (using TLSv1.2 with cipher DHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id 14BC7A024E for ; Fri, 28 Aug 2020 00:14:22 +1000 (AEST) From: Andrew Donnellan To: patchwork@lists.ozlabs.org Subject: [PATCH 2/5] urls: Update url pattern functions Date: Fri, 28 Aug 2020 00:14:03 +1000 Message-Id: <20200827141406.18231-2-ajd@linux.ibm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200827141406.18231-1-ajd@linux.ibm.com> References: <20200827141406.18231-1-ajd@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687 definitions=2020-08-27_07:2020-08-27, 2020-08-27 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 clxscore=1015 mlxscore=0 adultscore=0 priorityscore=1501 bulkscore=0 phishscore=0 malwarescore=0 spamscore=0 suspectscore=4 lowpriorityscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2008270103 X-BeenThere: patchwork@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Patchwork development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Patchwork" Django 3.1 deprecates django.conf.urls.url() as an alias for django.urls.re_path(). Also switch to using django.urls.include() rather than django.conf.urls.include(). Signed-off-by: Andrew Donnellan Reviewed-by: Stephen Finucane --- patchwork/urls.py | 331 +++++++++++++++++++++++----------------------- 1 file changed, 167 insertions(+), 164 deletions(-) diff --git a/patchwork/urls.py b/patchwork/urls.py index 7d888d4a3dc0..280d28d8e5bd 100644 --- a/patchwork/urls.py +++ b/patchwork/urls.py @@ -4,10 +4,9 @@ # SPDX-License-Identifier: GPL-2.0-or-later from django.conf import settings -from django.conf.urls import url, include from django.contrib import admin from django.contrib.auth import views as auth_views -from django.urls import reverse_lazy +from django.urls import include, re_path, reverse_lazy from patchwork.views import about as about_views from patchwork.views import api as api_views @@ -27,15 +26,16 @@ from patchwork.views import xmlrpc as xmlrpc_views admin.autodiscover() urlpatterns = [ - url(r'^admin/', admin.site.urls), + re_path(r'^admin/', admin.site.urls), - url(r'^$', project_views.project_list, name='project-list'), - url(r'^project/(?P[^/]+)/list/$', patch_views.patch_list, - name='patch-list'), - url(r'^project/(?P[^/]+)/bundles/$', bundle_views.bundle_list, - name='bundle-list'), - url(r'^project/(?P[^/]+)/$', project_views.project_detail, - name='project-detail'), + re_path(r'^$', project_views.project_list, name='project-list'), + re_path(r'^project/(?P[^/]+)/list/$', patch_views.patch_list, + name='patch-list'), + re_path(r'^project/(?P[^/]+)/bundles/$', + bundle_views.bundle_list, + name='bundle-list'), + re_path(r'^project/(?P[^/]+)/$', project_views.project_detail, + name='project-detail'), # patch views # NOTE(dja): Per the RFC, msgids can contain slashes. There doesn't seem @@ -49,128 +49,129 @@ urlpatterns = [ # work, but it is RECOMMENDED by the RFC that the right hand side of the @ # contains a domain, so I think breaking on messages that have "domains" # ending in /raw/ or /mbox/ is good enough. - url(r'^project/(?P[^/]+)/patch/(?P.+)/raw/$', - patch_views.patch_raw, name='patch-raw'), - url(r'^project/(?P[^/]+)/patch/(?P.+)/mbox/$', - patch_views.patch_mbox, name='patch-mbox'), - url(r'^project/(?P[^/]+)/patch/(?P.+)/$', - patch_views.patch_detail, name='patch-detail'), + re_path(r'^project/(?P[^/]+)/patch/(?P.+)/raw/$', + patch_views.patch_raw, name='patch-raw'), + re_path(r'^project/(?P[^/]+)/patch/(?P.+)/mbox/$', + patch_views.patch_mbox, name='patch-mbox'), + re_path(r'^project/(?P[^/]+)/patch/(?P.+)/$', + patch_views.patch_detail, name='patch-detail'), # ... old-style /patch/N/* urls - url(r'^patch/(?P\d+)/raw/$', patch_views.patch_raw_by_id, - name='patch-raw-redirect'), - url(r'^patch/(?P\d+)/mbox/$', patch_views.patch_mbox_by_id, - name='patch-mbox-redirect'), - url(r'^patch/(?P\d+)/$', patch_views.patch_by_id, - name='patch-id-redirect'), + re_path(r'^patch/(?P\d+)/raw/$', patch_views.patch_raw_by_id, + name='patch-raw-redirect'), + re_path(r'^patch/(?P\d+)/mbox/$', patch_views.patch_mbox_by_id, + name='patch-mbox-redirect'), + re_path(r'^patch/(?P\d+)/$', patch_views.patch_by_id, + name='patch-id-redirect'), # cover views - url(r'^project/(?P[^/]+)/cover/(?P.+)/mbox/$', - cover_views.cover_mbox, name='cover-mbox'), - url(r'^project/(?P[^/]+)/cover/(?P.+)/$', - cover_views.cover_detail, name='cover-detail'), + re_path(r'^project/(?P[^/]+)/cover/(?P.+)/mbox/$', + cover_views.cover_mbox, name='cover-mbox'), + re_path(r'^project/(?P[^/]+)/cover/(?P.+)/$', + cover_views.cover_detail, name='cover-detail'), # ... old-style /cover/N/* urls - url(r'^cover/(?P\d+)/mbox/$', cover_views.cover_mbox_by_id, - name='cover-mbox-redirect'), - url(r'^cover/(?P\d+)/$', cover_views.cover_by_id, - name='cover-id-redirect'), + re_path(r'^cover/(?P\d+)/mbox/$', cover_views.cover_mbox_by_id, + name='cover-mbox-redirect'), + re_path(r'^cover/(?P\d+)/$', cover_views.cover_by_id, + name='cover-id-redirect'), # comment views - url(r'^comment/(?P\d+)/$', comment_views.comment, - name='comment-redirect'), + re_path(r'^comment/(?P\d+)/$', comment_views.comment, + name='comment-redirect'), # series views - url(r'^series/(?P\d+)/mbox/$', series_views.series_mbox, - name='series-mbox'), + re_path(r'^series/(?P\d+)/mbox/$', series_views.series_mbox, + name='series-mbox'), # logged-in user stuff - url(r'^user/$', user_views.profile, name='user-profile'), - url(r'^user/todo/$', user_views.todo_lists, - name='user-todos'), - url(r'^user/todo/(?P[^/]+)/$', user_views.todo_list, - name='user-todo'), - url(r'^user/bundles/$', bundle_views.bundle_list, - name='user-bundles'), - - url(r'^user/link/$', user_views.link, - name='user-link'), - url(r'^user/unlink/(?P[^/]+)/$', user_views.unlink, - name='user-unlink'), + re_path(r'^user/$', user_views.profile, name='user-profile'), + re_path(r'^user/todo/$', user_views.todo_lists, + name='user-todos'), + re_path(r'^user/todo/(?P[^/]+)/$', user_views.todo_list, + name='user-todo'), + re_path(r'^user/bundles/$', bundle_views.bundle_list, + name='user-bundles'), + + re_path(r'^user/link/$', user_views.link, + name='user-link'), + re_path(r'^user/unlink/(?P[^/]+)/$', user_views.unlink, + name='user-unlink'), # password change - url(r'^user/password-change/$', - auth_views.PasswordChangeView.as_view(), - name='password_change'), - url(r'^user/password-change/done/$', - auth_views.PasswordChangeDoneView.as_view(), - name='password_change_done'), - url(r'^user/password-reset/$', - auth_views.PasswordResetView.as_view(), - name='password_reset'), - url(r'^user/password-reset/mail-sent/$', - auth_views.PasswordResetDoneView.as_view(), - name='password_reset_done'), - url(r'^user/password-reset/(?P[0-9A-Za-z_\-]+)/' - r'(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', - auth_views.PasswordResetConfirmView.as_view(), - name='password_reset_confirm'), - url(r'^user/password-reset/complete/$', - auth_views.PasswordResetCompleteView.as_view(), - name='password_reset_complete'), + re_path(r'^user/password-change/$', + auth_views.PasswordChangeView.as_view(), + name='password_change'), + re_path(r'^user/password-change/done/$', + auth_views.PasswordChangeDoneView.as_view(), + name='password_change_done'), + re_path(r'^user/password-reset/$', + auth_views.PasswordResetView.as_view(), + name='password_reset'), + re_path(r'^user/password-reset/mail-sent/$', + auth_views.PasswordResetDoneView.as_view(), + name='password_reset_done'), + re_path(r'^user/password-reset/(?P[0-9A-Za-z_\-]+)/' + r'(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', + auth_views.PasswordResetConfirmView.as_view(), + name='password_reset_confirm'), + re_path(r'^user/password-reset/complete/$', + auth_views.PasswordResetCompleteView.as_view(), + name='password_reset_complete'), # login/logout - url(r'^user/login/$', auth_views.LoginView.as_view( - template_name='patchwork/login.html'), - name='auth_login'), - url(r'^user/logout/$', auth_views.LogoutView.as_view( - next_page=reverse_lazy('project-list')), - name='auth_logout'), + re_path(r'^user/login/$', auth_views.LoginView.as_view( + template_name='patchwork/login.html'), + name='auth_login'), + re_path(r'^user/logout/$', auth_views.LogoutView.as_view( + next_page=reverse_lazy('project-list')), + name='auth_logout'), # registration - url(r'^register/', user_views.register, name='user-register'), + re_path(r'^register/', user_views.register, name='user-register'), # public view for bundles - url(r'^bundle/(?P[^/]*)/(?P[^/]*)/$', - bundle_views.bundle_detail, - name='bundle-detail'), - url(r'^bundle/(?P[^/]*)/(?P[^/]*)/mbox/$', - bundle_views.bundle_mbox, - name='bundle-mbox'), + re_path(r'^bundle/(?P[^/]*)/(?P[^/]*)/$', + bundle_views.bundle_detail, + name='bundle-detail'), + re_path(r'^bundle/(?P[^/]*)/(?P[^/]*)/mbox/$', + bundle_views.bundle_mbox, + name='bundle-mbox'), - url(r'^confirm/(?P[0-9a-f]+)/$', notification_views.confirm, - name='confirm'), + re_path(r'^confirm/(?P[0-9a-f]+)/$', notification_views.confirm, + name='confirm'), # submitter autocomplete - url(r'^submitter/$', api_views.submitters, name='api-submitters'), - url(r'^delegate/$', api_views.delegates, name='api-delegates'), + re_path(r'^submitter/$', api_views.submitters, name='api-submitters'), + re_path(r'^delegate/$', api_views.delegates, name='api-delegates'), # email setup - url(r'^mail/$', mail_views.settings, name='mail-settings'), - url(r'^mail/optout/$', mail_views.optout, name='mail-optout'), - url(r'^mail/optin/$', mail_views.optin, name='mail-optin'), + re_path(r'^mail/$', mail_views.settings, name='mail-settings'), + re_path(r'^mail/optout/$', mail_views.optout, name='mail-optout'), + re_path(r'^mail/optin/$', mail_views.optin, name='mail-optin'), # about - url(r'^about/$', about_views.about, name='about'), + re_path(r'^about/$', about_views.about, name='about'), # legacy redirects - url(r'^help/$', about_views.redirect, name='help'), - url(r'^help/about/$', about_views.redirect, name='help-about'), + re_path(r'^help/$', about_views.redirect, name='help'), + re_path(r'^help/about/$', about_views.redirect, name='help-about'), ] if 'debug_toolbar' in settings.INSTALLED_APPS: import debug_toolbar # noqa urlpatterns += [ - url(r'^__debug__/', include(debug_toolbar.urls)), + re_path(r'^__debug__/', include(debug_toolbar.urls)), ] if settings.ENABLE_XMLRPC: urlpatterns += [ - url(r'xmlrpc/$', xmlrpc_views.xmlrpc, name='xmlrpc'), - url(r'^project/(?P[^/]+)/pwclientrc/$', - pwclient_views.pwclientrc, - name='pwclientrc'), + re_path(r'xmlrpc/$', xmlrpc_views.xmlrpc, name='xmlrpc'), + re_path(r'^project/(?P[^/]+)/pwclientrc/$', + pwclient_views.pwclientrc, + name='pwclientrc'), # legacy redirect - url(r'^help/pwclient/$', about_views.redirect, name='help-pwclient'), + re_path(r'^help/pwclient/$', about_views.redirect, + name='help-pwclient'), ] if settings.ENABLE_REST_API: @@ -191,88 +192,90 @@ if settings.ENABLE_REST_API: from patchwork.api import user as api_user_views # noqa api_patterns = [ - url(r'^$', - api_index_views.IndexView.as_view(), - name='api-index'), - url(r'^users/$', - api_user_views.UserList.as_view(), - name='api-user-list'), - url(r'^users/(?P[^/]+)/$', - api_user_views.UserDetail.as_view(), - name='api-user-detail'), - url(r'^people/$', - api_person_views.PersonList.as_view(), - name='api-person-list'), - url(r'^people/(?P[^/]+)/$', - api_person_views.PersonDetail.as_view(), - name='api-person-detail'), - url(r'^covers/$', - api_cover_views.CoverList.as_view(), - name='api-cover-list'), - url(r'^covers/(?P[^/]+)/$', - api_cover_views.CoverDetail.as_view(), - name='api-cover-detail'), - url(r'^patches/$', - api_patch_views.PatchList.as_view(), - name='api-patch-list'), - url(r'^patches/(?P[^/]+)/$', - api_patch_views.PatchDetail.as_view(), - name='api-patch-detail'), - url(r'^patches/(?P[^/]+)/checks/$', - api_check_views.CheckListCreate.as_view(), - name='api-check-list'), - url(r'^patches/(?P[^/]+)/checks/(?P[^/]+)/$', - api_check_views.CheckDetail.as_view(), - name='api-check-detail'), - url(r'^series/$', - api_series_views.SeriesList.as_view(), - name='api-series-list'), - url(r'^series/(?P[^/]+)/$', - api_series_views.SeriesDetail.as_view(), - name='api-series-detail'), - url(r'^bundles/$', - api_bundle_views.BundleList.as_view(), - name='api-bundle-list'), - url(r'^bundles/(?P[^/]+)/$', - api_bundle_views.BundleDetail.as_view(), - name='api-bundle-detail'), - url(r'^projects/$', - api_project_views.ProjectList.as_view(), - name='api-project-list'), - url(r'^projects/(?P[^/]+)/$', - api_project_views.ProjectDetail.as_view(), - name='api-project-detail'), - url(r'^events/$', - api_event_views.EventList.as_view(), - name='api-event-list'), + re_path(r'^$', + api_index_views.IndexView.as_view(), + name='api-index'), + re_path(r'^users/$', + api_user_views.UserList.as_view(), + name='api-user-list'), + re_path(r'^users/(?P[^/]+)/$', + api_user_views.UserDetail.as_view(), + name='api-user-detail'), + re_path(r'^people/$', + api_person_views.PersonList.as_view(), + name='api-person-list'), + re_path(r'^people/(?P[^/]+)/$', + api_person_views.PersonDetail.as_view(), + name='api-person-detail'), + re_path(r'^covers/$', + api_cover_views.CoverList.as_view(), + name='api-cover-list'), + re_path(r'^covers/(?P[^/]+)/$', + api_cover_views.CoverDetail.as_view(), + name='api-cover-detail'), + re_path(r'^patches/$', + api_patch_views.PatchList.as_view(), + name='api-patch-list'), + re_path(r'^patches/(?P[^/]+)/$', + api_patch_views.PatchDetail.as_view(), + name='api-patch-detail'), + re_path(r'^patches/(?P[^/]+)/checks/$', + api_check_views.CheckListCreate.as_view(), + name='api-check-list'), + re_path(r'^patches/(?P[^/]+)/checks/(?P[^/]+)/$', + api_check_views.CheckDetail.as_view(), + name='api-check-detail'), + re_path(r'^series/$', + api_series_views.SeriesList.as_view(), + name='api-series-list'), + re_path(r'^series/(?P[^/]+)/$', + api_series_views.SeriesDetail.as_view(), + name='api-series-detail'), + re_path(r'^bundles/$', + api_bundle_views.BundleList.as_view(), + name='api-bundle-list'), + re_path(r'^bundles/(?P[^/]+)/$', + api_bundle_views.BundleDetail.as_view(), + name='api-bundle-detail'), + re_path(r'^projects/$', + api_project_views.ProjectList.as_view(), + name='api-project-list'), + re_path(r'^projects/(?P[^/]+)/$', + api_project_views.ProjectDetail.as_view(), + name='api-project-detail'), + re_path(r'^events/$', + api_event_views.EventList.as_view(), + name='api-event-list'), ] api_1_1_patterns = [ - url(r'^patches/(?P[^/]+)/comments/$', - api_comment_views.PatchCommentList.as_view(), - name='api-patch-comment-list'), - url(r'^covers/(?P[^/]+)/comments/$', - api_comment_views.CoverCommentList.as_view(), - name='api-cover-comment-list'), + re_path(r'^patches/(?P[^/]+)/comments/$', + api_comment_views.PatchCommentList.as_view(), + name='api-patch-comment-list'), + re_path(r'^covers/(?P[^/]+)/comments/$', + api_comment_views.CoverCommentList.as_view(), + name='api-cover-comment-list'), ] urlpatterns += [ - url(r'^api/(?:(?P(1.0|1.1|1.2))/)?', include(api_patterns)), - url(r'^api/(?:(?P(1.1|1.2))/)?', include(api_1_1_patterns)), + re_path(r'^api/(?:(?P(1.0|1.1|1.2))/)?', + include(api_patterns)), + re_path(r'^api/(?:(?P(1.1|1.2))/)?', + include(api_1_1_patterns)), # token change - url(r'^user/generate-token/$', user_views.generate_token, - name='generate_token'), + re_path(r'^user/generate-token/$', user_views.generate_token, + name='generate_token'), ] # redirect from old urls if settings.COMPAT_REDIR: urlpatterns += [ - url(r'^user/bundle/(?P[^/]+)/$', - bundle_views.bundle_detail_redir, - name='bundle-redir'), - url(r'^user/bundle/(?P[^/]+)/mbox/$', - bundle_views.bundle_mbox_redir, - name='bundle-mbox-redir'), + re_path(r'^user/bundle/(?P[^/]+)/$', + bundle_views.bundle_detail_redir, + name='bundle-redir'), + re_path(r'^user/bundle/(?P[^/]+)/mbox/$', + bundle_views.bundle_mbox_redir, + name='bundle-mbox-redir'), ] From patchwork Thu Aug 27 14:14:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Donnellan X-Patchwork-Id: 1352598 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BclD62mscz9sSP for ; Fri, 28 Aug 2020 00:17:10 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=I8FkPE5J; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4BclD52mwTzDqJ2 for ; Fri, 28 Aug 2020 00:17:09 +1000 (AEST) X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linux.ibm.com (client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com; envelope-from=ajd@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=I8FkPE5J; dkim-atps=neutral Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Bcl955D82zDqcn for ; Fri, 28 Aug 2020 00:14:33 +1000 (AEST) Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 07RE5EYr151250 for ; Thu, 27 Aug 2020 10:14:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=P+EdxTs90ulgRbE+qxZhMaE1fUElhX/BYr/SBGOG75c=; b=I8FkPE5J3AY6WHcMZ27HOe38/5n2DzMfxe55TUIcPkuspFc75i+Co9TF3gQcRoZ+yopu jRAD4nuJBdHOa/LhZ4CrPe+S5XQnx5PpeXp6But2sN1xoNk8N5pwJ8mWjJ6D3YgDc2rn dExcVPhxRDRH58bauRHqr4AAAIJFtnBzlOsNO7tcYHhH/vUajiX6v8dPBETJetr05Ukp x6vuRJWO1m/EcVhFhYzfR2SAtopKVIPYL+tRAeSk0DoNBO11+Ny0E2b85nW+s/9HOToS mPNDn0Rqv+73FlFm6wq7++JUGIUGv4KTx00EvDqY8CxOycsZJpsCBJ8d1DDIcgKgR423 Qw== Received: from ppma04ams.nl.ibm.com (63.31.33a9.ip4.static.sl-reverse.com [169.51.49.99]) by mx0a-001b2d01.pphosted.com with ESMTP id 336e1yrqx7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 27 Aug 2020 10:14:28 -0400 Received: from pps.filterd (ppma04ams.nl.ibm.com [127.0.0.1]) by ppma04ams.nl.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 07REDCUp025395 for ; Thu, 27 Aug 2020 14:14:26 GMT Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by ppma04ams.nl.ibm.com with ESMTP id 336124rqp1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 27 Aug 2020 14:14:26 +0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 07REEN1a30671234 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 27 Aug 2020 14:14:24 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D1DA052051 for ; Thu, 27 Aug 2020 14:14:23 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id 7FC8452057 for ; Thu, 27 Aug 2020 14:14:23 +0000 (GMT) Received: from intelligence.ibm.com (unknown [9.81.217.160]) (using TLSv1.2 with cipher DHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id 4F58CA0258 for ; Fri, 28 Aug 2020 00:14:22 +1000 (AEST) From: Andrew Donnellan To: patchwork@lists.ozlabs.org Subject: [PATCH 3/5] settings: Add context processor django.template.context_processors.request Date: Fri, 28 Aug 2020 00:14:04 +1000 Message-Id: <20200827141406.18231-3-ajd@linux.ibm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200827141406.18231-1-ajd@linux.ibm.com> References: <20200827141406.18231-1-ajd@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687 definitions=2020-08-27_07:2020-08-27, 2020-08-27 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 malwarescore=0 adultscore=0 impostorscore=0 suspectscore=1 clxscore=1015 mlxlogscore=753 priorityscore=1501 spamscore=0 bulkscore=0 phishscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2008270107 X-BeenThere: patchwork@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Patchwork development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Patchwork" Django 3.1 adds a new admin sidebar feature that requires the django.template.context_processors.request context processor to be enabled in the settings. Signed-off-by: Andrew Donnellan Reviewed-by: Stephen Finucane --- patchwork/settings/base.py | 1 + 1 file changed, 1 insertion(+) diff --git a/patchwork/settings/base.py b/patchwork/settings/base.py index 001878acb134..c1bb9b27fac8 100644 --- a/patchwork/settings/base.py +++ b/patchwork/settings/base.py @@ -57,6 +57,7 @@ TEMPLATES = [ 'django.template.context_processors.debug', 'django.template.context_processors.i18n', 'django.template.context_processors.media', + 'django.template.context_processors.request', 'django.template.context_processors.static', 'django.template.context_processors.tz', 'django.contrib.messages.context_processors.messages', From patchwork Thu Aug 27 14:14:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Donnellan X-Patchwork-Id: 1352597 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BclBy6Bkzz9sSP for ; Fri, 28 Aug 2020 00:16:10 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=k/CFPOu2; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4BclBx6Z8HzDqcx for ; Fri, 28 Aug 2020 00:16:09 +1000 (AEST) X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linux.ibm.com (client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com; envelope-from=ajd@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=k/CFPOu2; dkim-atps=neutral Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Bcl953qmFzDqRK for ; Fri, 28 Aug 2020 00:14:31 +1000 (AEST) Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 07RE4foh073206 for ; Thu, 27 Aug 2020 10:14:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=qPU5Vv8Z+LV3l7teWLuS6CvF+X9s6JWOU6RWHKy0IyE=; b=k/CFPOu2/tv1G8lzFiQbFkGYG0khBttjb5l9NOUcCmr68dkRSOoD8OKb8IZn/KBYH80u Vf8Zkkqj1yiRuVQ6l5GX44bs5rcKN0y2+NIUZxq5HLqN/LEQZNVY3jgMXXkU6twNxebO cOx2XBqo5BOQHrED2syZ5SgTYIljM2qMBhMQFKhyeT+piUsqbMX5nUvnnBJF6nrOURvK j04YAbJ741mfBMgAfCcJplpERXMn9lGFASieaHCuYST20R9eEzxuHNB/HirSMf0RB0u1 5tSlhNJ1fZbFGO06CJMEBojRWb261jdSkjOxf8PZUEpWAhfUjud58Hpox9mKaOI275Gs IQ== Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0a-001b2d01.pphosted.com with ESMTP id 336c7bcqhr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 27 Aug 2020 10:14:28 -0400 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 07RECZ2E013296 for ; Thu, 27 Aug 2020 14:14:26 GMT Received: from b06avi18878370.portsmouth.uk.ibm.com (b06avi18878370.portsmouth.uk.ibm.com [9.149.26.194]) by ppma06ams.nl.ibm.com with ESMTP id 332uk6ds27-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 27 Aug 2020 14:14:26 +0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06avi18878370.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 07REEOE958589544 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 27 Aug 2020 14:14:24 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 11A2C4C044 for ; Thu, 27 Aug 2020 14:14:24 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B30914C04A for ; Thu, 27 Aug 2020 14:14:23 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP for ; Thu, 27 Aug 2020 14:14:23 +0000 (GMT) Received: from intelligence.ibm.com (unknown [9.81.217.160]) (using TLSv1.2 with cipher DHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id 785EDA037C for ; Fri, 28 Aug 2020 00:14:22 +1000 (AEST) From: Andrew Donnellan To: patchwork@lists.ozlabs.org Subject: [PATCH 4/5] requirements: Update django-filter Date: Fri, 28 Aug 2020 00:14:05 +1000 Message-Id: <20200827141406.18231-4-ajd@linux.ibm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200827141406.18231-1-ajd@linux.ibm.com> References: <20200827141406.18231-1-ajd@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687 definitions=2020-08-27_07:2020-08-27, 2020-08-27 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 adultscore=0 spamscore=0 clxscore=1015 impostorscore=0 phishscore=0 priorityscore=1501 malwarescore=0 suspectscore=1 bulkscore=0 mlxlogscore=885 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2008270107 X-BeenThere: patchwork@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Patchwork development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Patchwork" Update django-filter dependency to a version that's compatible with Django 3.1. Signed-off-by: Andrew Donnellan Reviewed-by: Stephen Finucane --- requirements-dev.txt | 2 +- requirements-prod.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index e5da0b831fd6..022f465deee5 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,6 +1,6 @@ Django~=3.0.0 djangorestframework~=3.11.0 -django-filter~=2.2.0 +django-filter~=2.3.0 django-debug-toolbar~=2.2.0 # django-dbbackup~=3.2.0 -r requirements-test.txt diff --git a/requirements-prod.txt b/requirements-prod.txt index dbd0bd543cf8..dc86ce0c042f 100644 --- a/requirements-prod.txt +++ b/requirements-prod.txt @@ -1,5 +1,5 @@ Django~=3.0.0 djangorestframework~=3.11.0 -django-filter~=2.2.0 +django-filter~=2.3.0 psycopg2-binary~=2.8.0 sqlparse~=0.3.0 From patchwork Thu Aug 27 14:14:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Donnellan X-Patchwork-Id: 1352596 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bcl9g0P9Qz9sSJ for ; Fri, 28 Aug 2020 00:15:03 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=UAbLwGcC; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4Bcl9d6rcszDqQ6 for ; Fri, 28 Aug 2020 00:15:01 +1000 (AEST) X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linux.ibm.com (client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com; envelope-from=ajd@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=UAbLwGcC; dkim-atps=neutral Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Bcl953trCzDqcm for ; Fri, 28 Aug 2020 00:14:32 +1000 (AEST) Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 07RE2W7S064623 for ; Thu, 27 Aug 2020 10:14:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=mxRD45pP7VPysNynAFsZkK6PP2XLp/w3lsutT6XFbTw=; b=UAbLwGcCiPBbC5EZFnR+yQQ4OIceuw3XmCKA7aJz6WHciH6yK/o4LKujciPqUgXK2RgB ugKWt27YV/OErw2cdSpQ39lTEjchulGFkX8xWX6GWkqy/epdSmad6K1ii2TjUij6lHAP hlY1+xAVU4ykI/eJawpIj66kaNZQx75mfrucbq6CzKrP93zH3aWC7UmjuETxdPcGYdH/ JXtZ7nkEpuaMUBERwnk01qllRv8SmiT/9EtFt1/bn3g/apgBlYWRpiN2s5UCH2XYIzlc tGlyTEeKUmnlp5BhO4eFvWXYkl14tUtqUeyqCbcIgOMAB8nBmtRf/Hyh3m8Hi8zMTRYV og== Received: from ppma03fra.de.ibm.com (6b.4a.5195.ip4.static.sl-reverse.com [149.81.74.107]) by mx0b-001b2d01.pphosted.com with ESMTP id 336dy2h3nu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 27 Aug 2020 10:14:28 -0400 Received: from pps.filterd (ppma03fra.de.ibm.com [127.0.0.1]) by ppma03fra.de.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 07RECjEA024437 for ; Thu, 27 Aug 2020 14:14:26 GMT Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by ppma03fra.de.ibm.com with ESMTP id 332utq3hc5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 27 Aug 2020 14:14:26 +0000 Received: from d06av24.portsmouth.uk.ibm.com (mk.ibm.com [9.149.105.60]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 07REEOEC28967192 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 27 Aug 2020 14:14:24 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3E5204203F for ; Thu, 27 Aug 2020 14:14:24 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DF50642042 for ; Thu, 27 Aug 2020 14:14:23 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP for ; Thu, 27 Aug 2020 14:14:23 +0000 (GMT) Received: from intelligence.ibm.com (unknown [9.81.217.160]) (using TLSv1.2 with cipher DHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id A30E2A037F for ; Fri, 28 Aug 2020 00:14:22 +1000 (AEST) From: Andrew Donnellan To: patchwork@lists.ozlabs.org Subject: [PATCH 5/5] Add support for Django 3.1 Date: Fri, 28 Aug 2020 00:14:06 +1000 Message-Id: <20200827141406.18231-5-ajd@linux.ibm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200827141406.18231-1-ajd@linux.ibm.com> References: <20200827141406.18231-1-ajd@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687 definitions=2020-08-27_07:2020-08-27, 2020-08-27 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 malwarescore=0 bulkscore=0 priorityscore=1501 clxscore=1011 mlxlogscore=973 suspectscore=0 lowpriorityscore=0 adultscore=0 spamscore=0 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2008270103 X-BeenThere: patchwork@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Patchwork development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Patchwork" Signed-off-by: Andrew Donnellan Reviewed-by: Stephen Finucane --- releasenotes/notes/django-3-1-support-f0450ed3e7983fe2.yaml | 5 +++++ requirements-dev.txt | 2 +- requirements-prod.txt | 2 +- tox.ini | 5 ++++- 4 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/django-3-1-support-f0450ed3e7983fe2.yaml diff --git a/releasenotes/notes/django-3-1-support-f0450ed3e7983fe2.yaml b/releasenotes/notes/django-3-1-support-f0450ed3e7983fe2.yaml new file mode 100644 index 000000000000..dff8af13a846 --- /dev/null +++ b/releasenotes/notes/django-3-1-support-f0450ed3e7983fe2.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + `Django 3.1 `_ is + now supported. diff --git a/requirements-dev.txt b/requirements-dev.txt index 022f465deee5..ce306cf3761d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,4 +1,4 @@ -Django~=3.0.0 +Django~=3.1.0 djangorestframework~=3.11.0 django-filter~=2.3.0 django-debug-toolbar~=2.2.0 diff --git a/requirements-prod.txt b/requirements-prod.txt index dc86ce0c042f..b7ca00b59310 100644 --- a/requirements-prod.txt +++ b/requirements-prod.txt @@ -1,4 +1,4 @@ -Django~=3.0.0 +Django~=3.1.0 djangorestframework~=3.11.0 django-filter~=2.3.0 psycopg2-binary~=2.8.0 diff --git a/tox.ini b/tox.ini index 0e4c78fbff2f..80b43a600bad 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 3.2 -envlist = pep8,docs,py{36,37,38}-django{22,30} +envlist = pep8,docs,py{36,37,38}-django{22,30,31} skipsdist = true ignore_basepython_conflict = true @@ -14,6 +14,9 @@ deps = django30: django>=3.0,<3.1 django30: djangorestframework>=3.10,<3.12 django30: django-filter>=2.2,<3.0 + django31: django>=3.1,<3.2 + django31: djangorestframework>=3.10,<3.12 + django31: django-filter>=2.3,<3.0 setenv = DJANGO_SETTINGS_MODULE = patchwork.settings.dev PYTHONDONTWRITEBYTECODE = 1