From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Thu, 14 May 2020 11:09:11 +0100
Subject: gentoo resync : 14.05.2020

---
 dev-util/cookiecutter/Manifest                   |  5 ++-
 dev-util/cookiecutter/cookiecutter-1.7.0.ebuild  | 44 ----------------------
 dev-util/cookiecutter/cookiecutter-1.7.2.ebuild  | 48 ++++++++++++++++++++++++
 dev-util/cookiecutter/files/test_cli-1.7.2.patch | 14 +++++++
 4 files changed, 65 insertions(+), 46 deletions(-)
 delete mode 100644 dev-util/cookiecutter/cookiecutter-1.7.0.ebuild
 create mode 100644 dev-util/cookiecutter/cookiecutter-1.7.2.ebuild
 create mode 100644 dev-util/cookiecutter/files/test_cli-1.7.2.patch

(limited to 'dev-util/cookiecutter')

diff --git a/dev-util/cookiecutter/Manifest b/dev-util/cookiecutter/Manifest
index 63ffb34fa020..1abe47abd89f 100644
--- a/dev-util/cookiecutter/Manifest
+++ b/dev-util/cookiecutter/Manifest
@@ -1,5 +1,6 @@
+AUX test_cli-1.7.2.patch 579 BLAKE2B 8a77388ddac5bf4aaf1f2f3d950318a8f3af582df9bca9004a6701c7347ff81abea25b0c33586153198906358583a2acf8e17b20248ad98215c44411739df581 SHA512 d5906423db6cf8254c411a5f33f4f0c6b9b2760bace1db5e131ac8ec47b740d5b78feb7caa450efcec6cfb05997ff8038fb9e3fff81585d9b64b455b492e5a52
 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
 EBUILD cookiecutter-1.6.0.ebuild 1244 BLAKE2B aec48fcedf80ffba9d86564edb5b98bb36833c0fd14af2fc0804848f75e7a0301dc909b450070a5c727a04bd0ba861ae8d59dd67d4d9b1b5b3d20b4500728069 SHA512 97c8b61e19023b9561f2720525329aa051861a2605e8e15cca0a5e916ccada89f4dce13bfee54507f6e5bc69684048694659fab02d372243062e04b3c7e2143f
-EBUILD cookiecutter-1.7.0.ebuild 1242 BLAKE2B 11945a5af5229b8ffc67a740981d90110267b63ee2b004aea162d2d66302089bd09699cf41d09b650623092e501c351fda66b1a5067513ea76ae2110f4cb0c03 SHA512 cefbb208017393d207a8aefea7118a70086351851bee3b7708d46fc6d705839108d421d4dc36b33c0850ae0291d08e4dd1ba6e707a73376baf7e441f965786c6
+EBUILD cookiecutter-1.7.2.ebuild 1295 BLAKE2B d70513d7befbe9d7e2ca959fec94be8605bf979ef1ddb344a42ec30f8cc1ae8a250da1a2c703ff3a74e2da76dca2e56f4b67952541f9813710ab60b7f53f7e89 SHA512 301a3d23b1c0b036a0a267c0e6cb74b38fa2177cafff548971e1083d744dd2ac3c94ef35922ed2fcd70bc545cbc1694f6410737b17496f7bd1660d2dd8afc272
 MISC metadata.xml 329 BLAKE2B 3030c112beee6c6e136abcd0390ad47553f874ba5ec6f5d19d87f84d5c9d930ac71d2219c064944601a09bce7c9b71ce1257d1664070f749f4447e2549521bee SHA512 4c36a71c316a8f5b946668fc160685a293c25a292917baad1345fdbafa5108166cf50343cd5fd3627447b5af5a1cf40848488eb0085708b0ca032ba7c44d4101
diff --git a/dev-util/cookiecutter/cookiecutter-1.7.0.ebuild b/dev-util/cookiecutter/cookiecutter-1.7.0.ebuild
deleted file mode 100644
index 13a0f94d191c..000000000000
--- a/dev-util/cookiecutter/cookiecutter-1.7.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Command-line utility to create projects from cookiecutters (project templates)"
-HOMEPAGE="https://github.com/audreyr/cookiecutter"
-
-SRC_URI="https://github.com/audreyr/cookiecutter/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/future-0.15.2[${PYTHON_USEDEP}]
-	>=dev-python/binaryornot-0.2.0[${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/setuptools[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-1.1[${PYTHON_USEDEP}]
-		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-vcs/git )"
-
-DOCS=( README.md HISTORY.md CONTRIBUTING.md )
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-util/cookiecutter/cookiecutter-1.7.2.ebuild b/dev-util/cookiecutter/cookiecutter-1.7.2.ebuild
new file mode 100644
index 000000000000..69fab484d8e2
--- /dev/null
+++ b/dev-util/cookiecutter/cookiecutter-1.7.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command-line utility to create projects from cookiecutters (project templates)"
+HOMEPAGE="https://github.com/audreyr/cookiecutter"
+
+SRC_URI="https://github.com/audreyr/cookiecutter/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-python/binaryornot-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
+	<dev-python/jinja-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/click-7.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}]
+	<dev-python/markupsafe-2.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-vcs/git )"
+
+DOCS=( README.md HISTORY.md CONTRIBUTING.md )
+
+PATCHES=(
+	"${FILESDIR}/test_cli-1.7.2.patch"
+	)
+
+python_test() {
+	pytest -o addopts= || die
+}
diff --git a/dev-util/cookiecutter/files/test_cli-1.7.2.patch b/dev-util/cookiecutter/files/test_cli-1.7.2.patch
new file mode 100644
index 000000000000..e9f8bfa51c39
--- /dev/null
+++ b/dev-util/cookiecutter/files/test_cli-1.7.2.patch
@@ -0,0 +1,14 @@
+diff --git a/tests/test_cli.py b/tests/test_cli.py
+index e9b559c..9d89b2f 100644
+--- a/tests/test_cli.py
++++ b/tests/test_cli.py
+@@ -401,7 +401,8 @@ def test_cli_extra_context_invalid_format(cli_runner):
+         'tests/fake-repo-pre/', '--no-input', '-v', 'ExtraContextWithNoEqualsSoInvalid',
+     )
+     assert result.exit_code == 2
+-    assert "Error: Invalid value for '[EXTRA_CONTEXT]...'" in result.output
++    assert "Error: Invalid value for"
++    assert "[EXTRA_CONTEXT]..." in result.output
+     assert 'should contain items of the form key=value' in result.output
+ 
+ 
-- 
cgit v1.2.3