From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7BEDC15808E for ; Sun, 24 Apr 2022 15:15:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA4ACE0823; Sun, 24 Apr 2022 15:15:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 45975E0823 for ; Sun, 24 Apr 2022 15:15:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 smtp.gentoo.org (Postfix) with ESMTPS id 62AFE34161C for ; Sun, 24 Apr 2022 15:15:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AF0EA105 for ; Sun, 24 Apr 2022 15:15:52 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1650813333.7d8c5eb0e236f393517848dddd34f69a86fa278d.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cookiecutter/files/, dev-util/cookiecutter/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/cookiecutter/cookiecutter-2.0.2-r1.ebuild dev-util/cookiecutter/cookiecutter-2.0.2.ebuild dev-util/cookiecutter/files/cookiecutter-2.0.2-relax-click-dependency.patch X-VCS-Directories: dev-util/cookiecutter/files/ dev-util/cookiecutter/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 7d8c5eb0e236f393517848dddd34f69a86fa278d X-VCS-Branch: master Date: Sun, 24 Apr 2022 15:15:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d337f8d2-28db-4881-ba2e-6dc99fa6eaa2 X-Archives-Hash: c28fe240743a0a5686ab2c7d54fb25ec commit: 7d8c5eb0e236f393517848dddd34f69a86fa278d Author: Andrew Ammerlaan gentoo org> AuthorDate: Sun Apr 24 15:14:00 2022 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Sun Apr 24 15:15:33 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d8c5eb0 dev-util/cookiecutter: relax dev-python/click dependency test pass just fine with click-8, corresponding upstream PR has already been merged Signed-off-by: Andrew Ammerlaan gentoo.org> ...r-2.0.2.ebuild => cookiecutter-2.0.2-r1.ebuild} | 4 +++- ...cookiecutter-2.0.2-relax-click-dependency.patch | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dev-util/cookiecutter/cookiecutter-2.0.2.ebuild b/dev-util/cookiecutter/cookiecutter-2.0.2-r1.ebuild similarity index 90% rename from dev-util/cookiecutter/cookiecutter-2.0.2.ebuild rename to dev-util/cookiecutter/cookiecutter-2.0.2-r1.ebuild index 8b3f58232e8a..099096bf9ad7 100644 --- a/dev-util/cookiecutter/cookiecutter-2.0.2.ebuild +++ b/dev-util/cookiecutter/cookiecutter-2.0.2-r1.ebuild @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~ppc64 ~x86" RDEPEND=" >=dev-python/binaryornot-0.4.4[${PYTHON_USEDEP}] >=dev-python/click-7.0[${PYTHON_USEDEP}] - =dev-python/jinja-2.7[${PYTHON_USEDEP}] =dev-python/jinja2-time-0.2.0[${PYTHON_USEDEP}] @@ -40,6 +40,8 @@ PATCHES=( "${FILESDIR}/test_cli-1.7.2.patch" # https://github.com/cookiecutter/cookiecutter/issues/1655 "${FILESDIR}/${P}-fix-path-in-test.patch" + # https://github.com/cookiecutter/cookiecutter/pull/1643 + "${FILESDIR}/${P}-relax-click-dependency.patch" ) distutils_enable_tests pytest diff --git a/dev-util/cookiecutter/files/cookiecutter-2.0.2-relax-click-dependency.patch b/dev-util/cookiecutter/files/cookiecutter-2.0.2-relax-click-dependency.patch new file mode 100644 index 000000000000..1ce7ea09f68b --- /dev/null +++ b/dev-util/cookiecutter/files/cookiecutter-2.0.2-relax-click-dependency.patch @@ -0,0 +1,22 @@ +From 931dded761400c99ab70a1469e9c6e1c9abdcb8c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jakub=20La=C5=84ski?= +Date: Fri, 21 Jan 2022 07:11:57 +0100 +Subject: [PATCH] Restore accidentally deleted support for click 8.x + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 654010fa..d703c3c2 100644 +--- a/setup.py ++++ b/setup.py +@@ -10,7 +10,7 @@ + requirements = [ + 'binaryornot>=0.4.4', + 'Jinja2>=2.7,<4.0.0', +- 'click>=7.0,<8.0.0', ++ 'click>=7.0,<9.0.0', + 'pyyaml>=5.3.1', + 'jinja2-time>=0.2.0', + 'python-slugify>=4.0.0',