From patchwork Sun Sep 8 16:05:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Finucane X-Patchwork-Id: 1159479 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 46RGNr2nY2z9sN1 for ; Mon, 9 Sep 2019 02:05:48 +1000 (AEST) 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="TKEoWaUM"; 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 46RGNr1vJFzDqRk for ; Mon, 9 Sep 2019 02:05:48 +1000 (AEST) X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=none (mailfrom) smtp.mailfrom=that.guru (client-ip=172.82.139.236; helo=qrelay236.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="TKEoWaUM"; dkim-atps=neutral Received: from qrelay236.mxroute.com (qrelay236.mxroute.com [172.82.139.236]) (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 46RGNj4XRtzDqQY for ; Mon, 9 Sep 2019 02:05:41 +1000 (AEST) Received: from filter001.mxrelay.co (unknown [94.130.183.33]) by qrelay236.mxroute.com (Postfix) with ESMTP id 51A382E0EEB; Sun, 8 Sep 2019 12:05:37 -0400 (EDT) Received: from one.mxroute.com (one.mxroute.com [195.201.59.211]) by filter001.mxrelay.co (Postfix) with ESMTPS id 020FA100A38; Sun, 8 Sep 2019 16:05:35 +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=3u2MizIzgK4xCOwZNpRlYxzGKJYaPBXlejsc07XQ7Kk=; b=TKEoWaUMKTjMr0E7q0xUx2WLoF W27zbSP+gUvoXYHxRurtm4m/W6/WeXEr5zDDrZDyDtfBFqerZBax17Z+hUdGh0zZnX4f3f5YKv/SV E4R/PQ9j58wkfYOgyGQ8i7eQglg/x+fiX+wQneYaBvQT/e9YET9xmb3Tf8ocYOURmz9jNlgUxBoJM 3RhsZC1BARcQAJxmKkKS5/+pbU6mmJvF/wIeLXTfeFwMlve/+HMxBE9ctMpEZ9zlfuxIrT0YoPbM7 MgP65WYJdTr5t1cASLhXmIBL7P4p+iaeW/Q0nDjSjz0zOWz/iK5OkfIVU6x5rBKX+G6re/tbDdPzR PdNJ7vzA==; From: Stephen Finucane To: patchwork@lists.ozlabs.org Subject: [PATCH] requirements: Switch to compatible releases Date: Sun, 8 Sep 2019 17:05:21 +0100 Message-Id: <20190908160521.32185-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" In commit ab0c443691, we switched from using commit ranges to fixed ranges. This was a good idea in so far as it ensures we're providing an application with dependencies that are guaranteed to work. However, Patchwork as a project isn't active enough to warrant the continued busy work effort necessary to keep bumping these versions and it's probably about time to abandon the experiment. However, rather than switching back to version ranges, use the compatible releases feature introduced in PEP 440 [1]. This gives us most of the benefits of ranges but with a nicer syntax. [1] https://www.python.org/dev/peps/pep-0440/#compatible-release Signed-off-by: Stephen Finucane Cc: Daniel Axtens --- requirements-dev.txt | 14 +++++++------- requirements-prod.txt | 14 +++++++------- requirements-test.txt | 10 +++++----- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 35ead6f9..ee0e10b6 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,8 +1,8 @@ -Django==2.2.5; python_version >= '3.5' -Django==1.11.24; python_version < '3.0' # pyup: ignore -djangorestframework==3.9.2 -django-filter==2.1.0; python_version >= '3.5' -django-filter==1.1.0; python_version < '3.0' # pyup: ignore -django-debug-toolbar==1.11 -django-dbbackup==3.2.0 +Django~=2.2; python_version >= '3.5' +Django~=1.11; python_version < '3.0' # pyup: ignore +djangorestframework~=3.9 +django-filter~=2.1; python_version >= '3.5' +django-filter~=1.1; python_version < '3.0' # pyup: ignore +django-debug-toolbar~=1.11 +django-dbbackup~=3.2 -r requirements-test.txt diff --git a/requirements-prod.txt b/requirements-prod.txt index ba950f7a..92b44079 100644 --- a/requirements-prod.txt +++ b/requirements-prod.txt @@ -1,7 +1,7 @@ -Django==2.2.5; python_version >= '3.5' -Django==1.11.24; python_version < '3.0' # pyup: ignore -djangorestframework==3.9.2 -django-filter==2.1.0; python_version >= '3.5' -django-filter==1.1.0; python_version < '3.0' # pyup: ignore -psycopg2-binary==2.8.2 -sqlparse==0.3.0 +Django~=2.2; python_version >= '3.5' +Django~=1.11; python_version < '3.0' # pyup: ignore +djangorestframework~=3.9 +django-filter~=2.1; python_version >= '3.5' +django-filter~=1.1; python_version < '3.0' # pyup: ignore +psycopg2-binary~=2.8 +sqlparse~=0.3 diff --git a/requirements-test.txt b/requirements-test.txt index 0ad3c8aa..ace4ec13 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,5 +1,5 @@ -mysqlclient==1.3.14 -psycopg2-binary==2.8.2 -sqlparse==0.3.0 -python-dateutil==2.8.0 -openapi-core==0.8.0 +mysqlclient~=1.3.14 +psycopg2-binary~=2.8 +sqlparse~=0.3.0 +python-dateutil~=2.8 +openapi-core~=0.8