[gentoo-commits] repo/gentoo:master commit in: dev-util/cookiecutter/files/, dev-util/cookiecutter/

["Andrew Ammerlaan" <andrewammerlaan@gentoo.org>]

commit:     7d8c5eb0e236f393517848dddd34f69a86fa278d
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 15:14:00 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> 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 <andrewammerlaan <AT> 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/click-8.0.0[${PYTHON_USEDEP}]
+	<dev-python/click-9.0.0[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
 	<dev-python/jinja-4.0.0[${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?= <jakub.lanski@gmail.com>
+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',