[gentoo-commits] repo/gentoo:master commit in: dev-util/cookiecutter/files/, dev-util/cookiecutter/
commit: 7d8c5eb0e236f39351784834f69a86fa278d
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Sun Apr 24 15:14:00 2022 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Sun Apr 24 15:15:33 2022 +
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 ..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',
[gentoo-commits] repo/gentoo:master commit in: dev-util/cookiecutter/files/, dev-util/cookiecutter/
commit: b73717326bbaad782ae3927c32a376d319f04293
Author: Cédric Krier gentoo org>
AuthorDate: Fri May 8 19:59:50 2020 +
Commit: Cédric Krier gentoo org>
CommitDate: Fri May 8 20:00:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7371732
dev-util/cookiecutter: Version bumps
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Cédric Krier gentoo.org>
dev-util/cookiecutter/Manifest | 2 +-
...tter-1.7.0.ebuild => cookiecutter-1.7.2.ebuild} | 26 +-
dev-util/cookiecutter/files/test_cli-1.7.2.patch | 14
3 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/dev-util/cookiecutter/Manifest b/dev-util/cookiecutter/Manifest
index 1e003fb6804..36833f08085 100644
--- a/dev-util/cookiecutter/Manifest
+++ b/dev-util/cookiecutter/Manifest
@@ -1,2 +1,2 @@
DIST cookiecutter-1.6.0.tar.gz 255579 BLAKE2B
68d50bc51cc0fa2f7fa84bf77933ad27b4dbdd9c06ed459c5aad8d604256c205bad5434b19b1b93ee95fdf5bf211124558994a9204a79cdfc1e433576a0e7fba
SHA512
0a06ae8fe7aceeeb0bcb98b5981d743b2e2e5d5f121c2e0703bb76399b0433816beaddb64c92f28d50f1781737db25907a10ec7b59f6c02c17171cfb56fb12f4
-DIST cookiecutter-1.7.0.tar.gz 249612 BLAKE2B
6ebf09d67640eead22da65d7226c20ebda9a38a36083f5c243e2594db228b21ac665fd7629be1440a78dd69116ba731b7f129489723c6826347acc01cb6eedfb
SHA512
2840a3e4c3072f76f79965d29bf9774f79d9f641a1ee96e3b8fdb714f67fd2e1f34020e148767759a083bff67f31f7cab2de311eeaf8a816d12b128b40563c19
+DIST cookiecutter-1.7.2.tar.gz 253484 BLAKE2B
de1c773cd5e53532edc7af7aaeac6061b1a5293330b8162da0f31895b0c3a58a4e0f36d66bee3da328a6b0a59fb5bd917a2f3f6fcf7772a4c63db5cd0030caae
SHA512
15cc145f143b4cac6e78b12e1c29e191d0c1c96b0187db05a4c8aac18310a5cb31d912073674ef4c01727c9b5a3b67f8c508842cb625db338b4034faa52a4a4c
diff --git a/dev-util/cookiecutter/cookiecutter-1.7.0.ebuild
b/dev-util/cookiecutter/cookiecutter-1.7.2.ebuild
similarity index 59%
rename from dev-util/cookiecutter/cookiecutter-1.7.0.ebuild
rename to dev-util/cookiecutter/cookiecutter-1.7.2.ebuild
index 13a0f94d191..69fab484d8e 100644
--- a/dev-util/cookiecutter/cookiecutter-1.7.0.ebuild
+++ b/dev-util/cookiecutter/cookiecutter-1.7.2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6..8} )
inherit distutils-r1
@@ -18,27 +18,31 @@ KEYWORDS="~amd64"
IUSE="test"
RESTRICT="!test? ( test )"
-RDEPEND=">=dev-python/future-0.15.2[${PYTHON_USEDEP}]
- >=dev-python/binaryornot-0.2.0[${PYTHON_USEDEP}]
+RDEPEND=">=dev-python/binaryornot-0.4.4[${PYTHON_USEDEP}]
>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
+ =dev-python/click-7.0[${PYTHON_USEDEP}]
- >=dev-python/whichcraft-0.4.0[${PYTHON_USEDEP}]
- >=dev-python/poyo-0.4.0[${PYTHON_USEDEP}]
- >=dev-python/jinja2-time-0.1.0[${PYTHON_USEDEP}]
- >=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+ >=dev-python/poyo-0.5.0[${PYTHON_USEDEP}]
+ >=dev-python/jinja2-time-0.2.0[${PYTHON_USEDEP}]
+ dev-python/python-slugify[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.23.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.10[${PYTHON_USEDEP}]
+
