diff options
| author |   Cédric Krier <cedk@gentoo.org> | 2020-05-08 21:59:50 +0200 |
|---|---|---|
| committer | Cédric Krier <cedk@gentoo.org> | 2020-05-08 22:00:32 +0200 |
| commit | b73717326bbaad782ae3927c32a376d319f04293 (patch) | |
| tree | f3f2cfe8c9f20633ca83ee750d02624f6fe3b207 /dev-util | |
| parent | sys-cluster/swift: fully remove tests (diff) | |
| download | gentoo-b73717326bbaad782ae3927c32a376d319f04293.tar.gz gentoo-b73717326bbaad782ae3927c32a376d319f04293.tar.bz2 gentoo-b73717326bbaad782ae3927c32a376d319f04293.zip | |
dev-util/cookiecutter: Version bumps
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Cédric Krier <cedk@gentoo.org>
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/cookiecutter/Manifest | 2 | ||||
| -rw-r--r-- | dev-util/cookiecutter/cookiecutter-1.7.2.ebuild (renamed from dev-util/cookiecutter/cookiecutter-1.7.0.ebuild) | 26 | ||||
| -rw-r--r-- | 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 1e003fb68049..36833f080859 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 index 13a0f94d191c..69fab484d8e2 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/jinja-3.0.0[${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}] + <dev-python/markupsafe-2.0.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/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() { - py.test || die + 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 + + |