| 1 |
commit: b73717326bbaad782ae3927c32a376d319f04293 |
| 2 |
Author: Cédric Krier <cedk <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 8 19:59:50 2020 +0000 |
| 4 |
Commit: Cédric Krier <cedk <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 8 20:00:32 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7371732 |
| 7 |
|
| 8 |
dev-util/cookiecutter: Version bumps |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 11 |
Signed-off-by: Cédric Krier <cedk <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-util/cookiecutter/Manifest | 2 +- |
| 14 |
...tter-1.7.0.ebuild => cookiecutter-1.7.2.ebuild} | 26 +++++++++++++--------- |
| 15 |
dev-util/cookiecutter/files/test_cli-1.7.2.patch | 14 ++++++++++++ |
| 16 |
3 files changed, 30 insertions(+), 12 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-util/cookiecutter/Manifest b/dev-util/cookiecutter/Manifest |
| 19 |
index 1e003fb6804..36833f08085 100644 |
| 20 |
--- a/dev-util/cookiecutter/Manifest |
| 21 |
+++ b/dev-util/cookiecutter/Manifest |
| 22 |
@@ -1,2 +1,2 @@ |
| 23 |
DIST cookiecutter-1.6.0.tar.gz 255579 BLAKE2B 68d50bc51cc0fa2f7fa84bf77933ad27b4dbdd9c06ed459c5aad8d604256c205bad5434b19b1b93ee95fdf5bf211124558994a9204a79cdfc1e433576a0e7fba SHA512 0a06ae8fe7aceeeb0bcb98b5981d743b2e2e5d5f121c2e0703bb76399b0433816beaddb64c92f28d50f1781737db25907a10ec7b59f6c02c17171cfb56fb12f4 |
| 24 |
-DIST cookiecutter-1.7.0.tar.gz 249612 BLAKE2B 6ebf09d67640eead22da65d7226c20ebda9a38a36083f5c243e2594db228b21ac665fd7629be1440a78dd69116ba731b7f129489723c6826347acc01cb6eedfb SHA512 2840a3e4c3072f76f79965d29bf9774f79d9f641a1ee96e3b8fdb714f67fd2e1f34020e148767759a083bff67f31f7cab2de311eeaf8a816d12b128b40563c19 |
| 25 |
+DIST cookiecutter-1.7.2.tar.gz 253484 BLAKE2B de1c773cd5e53532edc7af7aaeac6061b1a5293330b8162da0f31895b0c3a58a4e0f36d66bee3da328a6b0a59fb5bd917a2f3f6fcf7772a4c63db5cd0030caae SHA512 15cc145f143b4cac6e78b12e1c29e191d0c1c96b0187db05a4c8aac18310a5cb31d912073674ef4c01727c9b5a3b67f8c508842cb625db338b4034faa52a4a4c |
| 26 |
|
| 27 |
diff --git a/dev-util/cookiecutter/cookiecutter-1.7.0.ebuild b/dev-util/cookiecutter/cookiecutter-1.7.2.ebuild |
| 28 |
similarity index 59% |
| 29 |
rename from dev-util/cookiecutter/cookiecutter-1.7.0.ebuild |
| 30 |
rename to dev-util/cookiecutter/cookiecutter-1.7.2.ebuild |
| 31 |
index 13a0f94d191..69fab484d8e 100644 |
| 32 |
--- a/dev-util/cookiecutter/cookiecutter-1.7.0.ebuild |
| 33 |
+++ b/dev-util/cookiecutter/cookiecutter-1.7.2.ebuild |
| 34 |
@@ -3,7 +3,7 @@ |
| 35 |
|
| 36 |
EAPI=7 |
| 37 |
|
| 38 |
-PYTHON_COMPAT=( python3_6 ) |
| 39 |
+PYTHON_COMPAT=( python3_{6..8} ) |
| 40 |
|
| 41 |
inherit distutils-r1 |
| 42 |
|
| 43 |
@@ -18,27 +18,31 @@ KEYWORDS="~amd64" |
| 44 |
IUSE="test" |
| 45 |
RESTRICT="!test? ( test )" |
| 46 |
|
| 47 |
-RDEPEND=">=dev-python/future-0.15.2[${PYTHON_USEDEP}] |
| 48 |
- >=dev-python/binaryornot-0.2.0[${PYTHON_USEDEP}] |
| 49 |
+RDEPEND=">=dev-python/binaryornot-0.4.4[${PYTHON_USEDEP}] |
| 50 |
>=dev-python/jinja-2.7[${PYTHON_USEDEP}] |
| 51 |
+ <dev-python/jinja-3.0.0[${PYTHON_USEDEP}] |
| 52 |
>=dev-python/click-7.0[${PYTHON_USEDEP}] |
| 53 |
- >=dev-python/whichcraft-0.4.0[${PYTHON_USEDEP}] |
| 54 |
- >=dev-python/poyo-0.4.0[${PYTHON_USEDEP}] |
| 55 |
- >=dev-python/jinja2-time-0.1.0[${PYTHON_USEDEP}] |
| 56 |
- >=dev-python/requests-2.18.0[${PYTHON_USEDEP}] |
| 57 |
+ >=dev-python/poyo-0.5.0[${PYTHON_USEDEP}] |
| 58 |
+ >=dev-python/jinja2-time-0.2.0[${PYTHON_USEDEP}] |
| 59 |
+ dev-python/python-slugify[${PYTHON_USEDEP}] |
| 60 |
+ >=dev-python/requests-2.23.0[${PYTHON_USEDEP}] |
| 61 |
+ >=dev-python/six-1.10[${PYTHON_USEDEP}] |
| 62 |
+ <dev-python/markupsafe-2.0.0[${PYTHON_USEDEP}] |
| 63 |
dev-python/setuptools[${PYTHON_USEDEP}]" |
| 64 |
|
| 65 |
DEPEND="${RDEPEND} |
| 66 |
test? ( |
| 67 |
dev-python/pytest[${PYTHON_USEDEP}] |
| 68 |
- dev-python/pytest-cov[${PYTHON_USEDEP}] |
| 69 |
- >=dev-python/pytest-mock-1.1[${PYTHON_USEDEP}] |
| 70 |
- dev-python/pytest-catchlog[${PYTHON_USEDEP}] |
| 71 |
+ dev-python/pytest-mock[${PYTHON_USEDEP}] |
| 72 |
dev-python/freezegun[${PYTHON_USEDEP}] |
| 73 |
dev-vcs/git )" |
| 74 |
|
| 75 |
DOCS=( README.md HISTORY.md CONTRIBUTING.md ) |
| 76 |
|
| 77 |
+PATCHES=( |
| 78 |
+ "${FILESDIR}/test_cli-1.7.2.patch" |
| 79 |
+ ) |
| 80 |
+ |
| 81 |
python_test() { |
| 82 |
- py.test || die |
| 83 |
+ pytest -o addopts= || die |
| 84 |
} |
| 85 |
|
| 86 |
diff --git a/dev-util/cookiecutter/files/test_cli-1.7.2.patch b/dev-util/cookiecutter/files/test_cli-1.7.2.patch |
| 87 |
new file mode 100644 |
| 88 |
index 00000000000..e9f8bfa51c3 |
| 89 |
--- /dev/null |
| 90 |
+++ b/dev-util/cookiecutter/files/test_cli-1.7.2.patch |
| 91 |
@@ -0,0 +1,14 @@ |
| 92 |
+diff --git a/tests/test_cli.py b/tests/test_cli.py |
| 93 |
+index e9b559c..9d89b2f 100644 |
| 94 |
+--- a/tests/test_cli.py |
| 95 |
++++ b/tests/test_cli.py |
| 96 |
+@@ -401,7 +401,8 @@ def test_cli_extra_context_invalid_format(cli_runner): |
| 97 |
+ 'tests/fake-repo-pre/', '--no-input', '-v', 'ExtraContextWithNoEqualsSoInvalid', |
| 98 |
+ ) |
| 99 |
+ assert result.exit_code == 2 |
| 100 |
+- assert "Error: Invalid value for '[EXTRA_CONTEXT]...'" in result.output |
| 101 |
++ assert "Error: Invalid value for" |
| 102 |
++ assert "[EXTRA_CONTEXT]..." in result.output |
| 103 |
+ assert 'should contain items of the form key=value' in result.output |
| 104 |
+ |
| 105 |
+ |
Archives