From patchwork Tue Apr 30 06:03:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Axtens X-Patchwork-Id: 1093002 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 44tWHn2t57z9s7T for ; Tue, 30 Apr 2019 16:06:29 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axtens.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=axtens.net header.i=@axtens.net header.b="qWIfETka"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 44tWHn1dFgzDqRn for ; Tue, 30 Apr 2019 16:06:29 +1000 (AEST) X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=axtens.net (client-ip=2607:f8b0:4864:20::533; helo=mail-pg1-x533.google.com; envelope-from=dja@axtens.net; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=axtens.net Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axtens.net header.i=@axtens.net header.b="qWIfETka"; dkim-atps=neutral Received: from mail-pg1-x533.google.com (mail-pg1-x533.google.com [IPv6:2607:f8b0:4864:20::533]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 44tWDl415QzDqMm for ; Tue, 30 Apr 2019 16:03:51 +1000 (AEST) Received: by mail-pg1-x533.google.com with SMTP id j26so6335356pgl.5 for ; Mon, 29 Apr 2019 23:03:51 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=QxELk3Vd4MxWmiqGtPr3A2RDOtHJzM8KGad5ajHG/EI=; b=qWIfETkahNbzFZL7QwIm1G4i1RX6saahMrUmo33fzCxxcw1NEnFfsaX86xU55cVFrC XOLrGb542rjNU5yMESrER6PIuA1iGGMNw7qEz3AKMit3L6YwyHJA35ITF0LV/LY14ckK u8yQybE7iE1c0BQVy/TVJ8vwRtqUn795WP0YU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QxELk3Vd4MxWmiqGtPr3A2RDOtHJzM8KGad5ajHG/EI=; b=FWb3mg7jxuXw3caWUp/GzAB1gadaV0NSPsulX2s/jC45NgbTNk491BGqbpP2SZzd8m 0sPijNMFHbcXM9wHr1bAOLlcePtdKQZidPiENP26HILAkT5KnoYhllSPhktSJtHAdwEV z47pkKuyMlhNNw/eqcXe0pLKz6vYwcvCUGj6F+7DuaILV6LeZ6E4XYfxcJpjJCacrk4B qYXlWHVOan4EpnAM+JJpb5hvhjSoDwMsX2b+66uiY91v8l9hDBi46NRdxiRtT0dS1wul MhPqzniG1iZvSIem/bNnJJG5sk2MN/uJh7jCEm7pn8+zJmJqXNNR7TWcad1o0UvItNUu 6RQw== X-Gm-Message-State: APjAAAVE+3zXg+/fwX8KYitaO8IBslJK+mcfdDKu9JwNu9Eq0K9bPvJk Y0eafp+/BQbX+o572HRcw+XvGrxKnfU= X-Google-Smtp-Source: APXvYqyc7w5MrB8qE7hH9C7tuV1paSG1346xwOGcjvwMwHXI5BA3/W9rEq6GSKsQSOWa1kmo79Ok6A== X-Received: by 2002:a63:6116:: with SMTP id v22mr27612362pgb.272.1556604229153; Mon, 29 Apr 2019 23:03:49 -0700 (PDT) Received: from localhost (203-217-53-131.dyn.iinet.net.au. [203.217.53.131]) by smtp.gmail.com with ESMTPSA id i10sm77106882pfj.7.2019.04.29.23.03.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Apr 2019 23:03:48 -0700 (PDT) From: Daniel Axtens To: patchwork@lists.ozlabs.org Subject: [PATCH 07/10] Add support for Django REST Framework 3.7, 3.8 Date: Tue, 30 Apr 2019 16:03:05 +1000 Message-Id: <20190430060308.10432-8-dja@axtens.net> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190430060308.10432-1-dja@axtens.net> References: <20190430060308.10432-1-dja@axtens.net> MIME-Version: 1.0 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" From: Stephen Finucane No breaking changes that concern us here. Signed-off-by: Stephen Finucane Reviewed-by: Daniel Axtens Signed-off-by: Daniel Axtens (cherry picked from commit a27f36fb784867e434527b8e65064ae3bdb12c82) Signed-off-by: Daniel Axtens --- README.rst | 2 +- .../notes/django-rest-framework-3-7-bc6ad5df8bc54afc.yaml | 6 ++++++ .../notes/django-rest-framework-3-8-23865db833b4d188.yaml | 6 ++++++ requirements-dev.txt | 2 +- requirements-prod.txt | 2 +- tox.ini | 5 +++-- 6 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 releasenotes/notes/django-rest-framework-3-7-bc6ad5df8bc54afc.yaml create mode 100644 releasenotes/notes/django-rest-framework-3-8-23865db833b4d188.yaml diff --git a/README.rst b/README.rst index 4a970ec5a9ff..ddc4b98125d1 100644 --- a/README.rst +++ b/README.rst @@ -45,7 +45,7 @@ Requirements - Django (1.8 - 1.11) -- Django REST Framework (3.2 - 3.6) +- Django REST Framework (3.4 - 3.8) - Django Filters (1.0) diff --git a/releasenotes/notes/django-rest-framework-3-7-bc6ad5df8bc54afc.yaml b/releasenotes/notes/django-rest-framework-3-7-bc6ad5df8bc54afc.yaml new file mode 100644 index 000000000000..4bf92c999df5 --- /dev/null +++ b/releasenotes/notes/django-rest-framework-3-7-bc6ad5df8bc54afc.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + `Django REST Framework 3.7 + `_ is now + supported. diff --git a/releasenotes/notes/django-rest-framework-3-8-23865db833b4d188.yaml b/releasenotes/notes/django-rest-framework-3-8-23865db833b4d188.yaml new file mode 100644 index 000000000000..dc2d2c8f8bfa --- /dev/null +++ b/releasenotes/notes/django-rest-framework-3-8-23865db833b4d188.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + `Django REST Framework 3.8 + `_ is now + supported. diff --git a/requirements-dev.txt b/requirements-dev.txt index 7a8fdb9c8851..b12246dd1b89 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,4 +1,4 @@ Django>=1.8,<2.0 -djangorestframework>=3.4,<3.7 +djangorestframework>=3.4,<3.9 django-filter>=1.0,<1.1 -r requirements-test.txt diff --git a/requirements-prod.txt b/requirements-prod.txt index d249ad84c10c..42ff8ecd82f1 100644 --- a/requirements-prod.txt +++ b/requirements-prod.txt @@ -1,5 +1,5 @@ Django>=1.8,<2.0 -djangorestframework>=3.4,<3.7 +djangorestframework>=3.4,<3.9 django-filter>=1.0,<1.1 psycopg2>=2.7,<2.8 sqlparse==0.2.4 diff --git a/tox.ini b/tox.ini index 327b9e7c14a8..5c741d374a64 100644 --- a/tox.ini +++ b/tox.ini @@ -10,8 +10,9 @@ deps = django19: django>=1.9,<1.10 django110: django>=1.10,<1.11 django111: django>=1.11,<2.0 - django{18,19,110}: djangorestframework>=3.4,<3.7 - django111: djangorestframework>=3.6,<3.7 + django{18,19}: djangorestframework>=3.4,<3.7 + django110: djangorestframework>=3.4,<3.9 + django111: djangorestframework>=3.6,<3.9 django{18,19,110,111}: django-filter>=1.0,<1.1 setenv = DJANGO_SETTINGS_MODULE = patchwork.settings.dev