From patchwork Tue Nov 5 03:16:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Finucane X-Patchwork-Id: 1189295 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 476ZbW5zTPz9sNx for ; Tue, 5 Nov 2019 14:17:27 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=that.guru Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=that.guru header.i=@that.guru header.b="fgDHU1w9"; 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 476ZbW4skTzF43j for ; Tue, 5 Nov 2019 14:17:27 +1100 (AEDT) X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=that.guru (client-ip=160.202.107.205; helo=q2relay205.mxroute.com; envelope-from=stephen@that.guru; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=that.guru Authentication-Results: lists.ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=that.guru header.i=@that.guru header.b="fgDHU1w9"; dkim-atps=neutral Received: from q2relay205.mxroute.com (q2relay205.mxroute.com [160.202.107.205]) (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 476ZbR1NPJzF42j for ; Tue, 5 Nov 2019 14:17:22 +1100 (AEDT) Received: from filter003.mxroute.com [168.235.111.26] (Authenticated sender: mN4UYu2MZsgR) by q2relay205.mxroute.com (ZoneMTA) with ESMTPSA id 16e39910495000f36a.001 for (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256); Tue, 05 Nov 2019 03:17:15 +0000 X-Zone-Loop: 221d7d69a9e5a5712bbbd80cdd61f7e1c01f266f45d4 X-Originating-IP: [168.235.111.26] Received: from one.mxroute.com (one.mxroute.com [195.201.59.211]) by filter003.mxroute.com (Postfix) with ESMTPS id C11A46115A for ; Tue, 5 Nov 2019 03:17:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=that.guru; s=default; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=cMoSG7B7B7V55jX0iuG/1rohgIgcru9qh8QPPcWwpG8=; b=fgDHU1w9I0zfMfUAEZMKToCoG9 5QNPeV5KlU2B5FA7IVDJcX5aJJT1WW9IPOrcoKqeJLQ/XMK7oEm3Gz4wTT1SSXBNSdRg2o/GF530L Bp5kTcafaKfzP9Qapi7rzDLJyjvZaVMuIci0PuLkvTzN92gHk0l289ff06ZNoVysomcbmU/T0T3cy NFl1VMbddNraRaCzWCY9HigkEOETAEERrzbdS48Zunige8yws8ToeiOOWlWiihz3DOwNCMosynu6n c6XFSWMTRIbAk5zXRTyfvvkCk57Ifab0UhejvXYxk7BL4dycHil0mpXEUtO0p9udACQSAT+UUDb4h PAVwiiGw==; From: Stephen Finucane To: patchwork@lists.ozlabs.org Subject: [PATCH] Revert "Remove Django 2.0 support" Date: Tue, 5 Nov 2019 03:16:57 +0000 Message-Id: <20191105031657.5094-1-stephen@that.guru> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-AuthUser: stephen@that.guru 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" This reverts commit f09bfd460814d7125437b0b45a183a221692584a. We haven't actually released a version of Patchwork with this release yet so it seems odd to skip it entirely. It's also incorrect, in that it adds an additional release note rather than remove the one that has not yet been included in a release. Given both of these, and the fact that 2.2 is just around the corner, we should simply revert this patch and reapply it in a few weeks instead. Signed-off-by: Stephen Finucane --- README.rst | 2 +- .../notes/remove-django-2-0-support-623b936d377a8e56.yaml | 4 ---- tox.ini | 7 ++++--- 3 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 releasenotes/notes/remove-django-2-0-support-623b936d377a8e56.yaml diff --git README.rst README.rst index f5fc1d1a..495cc2bd 100644 --- README.rst +++ README.rst @@ -39,7 +39,7 @@ Requirements - Python (2.7, 3.5 - 3.8) -- Django (1.11, 2.1 - 2.2) +- Django (1.11 - 2.2) - Django REST Framework (3.6 - 3.9) diff --git releasenotes/notes/remove-django-2-0-support-623b936d377a8e56.yaml releasenotes/notes/remove-django-2-0-support-623b936d377a8e56.yaml deleted file mode 100644 index 58a1273a..00000000 --- releasenotes/notes/remove-django-2-0-support-623b936d377a8e56.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -upgrade: - - | - Django 2.0 is no longer supported. It is no longer supported upstream. diff --git tox.ini tox.ini index 397a1c52..140c1924 100644 --- tox.ini +++ tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 2.0 -envlist = pep8,docs,py27-django111,py{35,36,37,38}-django{111,21,22} +envlist = pep8,docs,py27-django111,py{35,36,37,38}-django{111,20,21,22} skipsdist = True [testenv] @@ -11,9 +11,10 @@ deps = django111: djangorestframework>=3.6,<3.10; python_version < '3.0' django111: django-filter>=1.0,<3.0; python_version >= '3.5' django111: django-filter>=1.0,<2.0; python_version < '3.0' + django20: django>=2.0,<2.1 django21: django>=2.1,<2.2 - django21: djangorestframework>=3.7,<3.11 - django21: django-filter>=2.0,<3.0 + django{20,21}: djangorestframework>=3.7,<3.11 + django{20,21}: django-filter>=2.0,<3.0 django22: django>=2.2,<2.3 django22: djangorestframework>=3.10,<3.11 django22: django-filter>=2.1,<3.0