commit: 05fc9520f54b1101e82b7d20a93b1a8f60c859e7 Author: Lucio Sauer <watermanpaint <AT> posteo <DOT> net> AuthorDate: Fri Jun 30 21:11:41 2023 +0000 Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me> CommitDate: Fri Jun 30 21:13:18 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=05fc9520
dev-python/pytest-mypy-plugins: drop 1.11.1 Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net> dev-python/pytest-mypy-plugins/Manifest | 1 - ...lugins-1.11.1-deprecated-chevron-to-jinja.patch | 45 ---------------------- .../pytest-mypy-plugins-1.11.1.ebuild | 37 ------------------ 3 files changed, 83 deletions(-) diff --git a/dev-python/pytest-mypy-plugins/Manifest b/dev-python/pytest-mypy-plugins/Manifest index 463d5fe1e..3a84cf3d7 100644 --- a/dev-python/pytest-mypy-plugins/Manifest +++ b/dev-python/pytest-mypy-plugins/Manifest @@ -1,2 +1 @@ -DIST pytest-mypy-plugins-1.11.1.gh.tar.gz 18201 BLAKE2B a21b089321a3d632225e0ac6aa921b23bba111dcc5234c2ada32522b7659533970a9bd19bb432d3304b0291e32ba067ab75c549c4552ca742835155ab8e711b1 SHA512 ac7a0973aba070c80480681f2910d40c7e510c906f8030413ba5c94f50131df19036c7183bfad3f211d6d375661753b9d4ff2a73b3bd7af06d0f442e94af3f64 DIST pytest-mypy-plugins-2.0.0.gh.tar.gz 18444 BLAKE2B a9def96003d85d76984067194abdbb5259379c09d359be6a3de7d4a68df2f8c7ebd033632c645297062564943b6cdee885c793172338b52110590be6911f6a75 SHA512 743d88884e3eef03cb52ffde82e42522ea961db6a27be3cba17aadceb47e1456ffd20806559dd7a6b183536aba98e592e97e40911199c4defbe66bfceebbf229 diff --git a/dev-python/pytest-mypy-plugins/files/pytest-mypy-plugins-1.11.1-deprecated-chevron-to-jinja.patch b/dev-python/pytest-mypy-plugins/files/pytest-mypy-plugins-1.11.1-deprecated-chevron-to-jinja.patch deleted file mode 100644 index ae2885893..000000000 --- a/dev-python/pytest-mypy-plugins/files/pytest-mypy-plugins-1.11.1-deprecated-chevron-to-jinja.patch +++ /dev/null @@ -1,45 +0,0 @@ -Chevron, an engine for the Mustache templating language, has been unmaintained -since 2021 and is not part of ::gentoo. The Jinja and Mustache templating -languages use the same syntax as far as this project is concerned. - -PR issued upstream by <watermanpa...@posteo.net>: -https://github.com/typeddjango/pytest-mypy-plugins/pull/117 ---- a/pytest_mypy_plugins/utils.py -+++ b/pytest_mypy_plugins/utils.py -@@ -11,10 +11,11 @@ from itertools import zip_longest - from pathlib import Path - from typing import Any, Callable, Dict, Iterator, List, Mapping, Optional, Tuple, Union - --import chevron -+import jinja2 - import regex - from decorator import contextmanager - -+_rendering_env = jinja2.Environment() - - @contextmanager - def temp_environ() -> Iterator[None]: -@@ -351,9 +352,10 @@ def extract_output_matchers_from_out(out: str, params: Mapping[str, Any], regex: - return matchers - - --def render_template(template: str, data: Mapping[str, Any]) -> str: -- return chevron.render(template=template, data={k: v if v is not None else "None" for k, v in data.items()}) - -+def render_template(template: str, data: Mapping[str, Any]) -> str: -+ template = _rendering_env.from_string(template) -+ return template.render({k: v if v is not None else "None" for k, v in data.items()}) - - def get_func_first_lnum(attr: Callable[..., None]) -> Optional[Tuple[int, List[str]]]: - lines, _ = inspect.getsourcelines(attr) ---- a/setup.py -+++ b/setup.py -@@ -8,7 +8,7 @@ dependencies = [ - "mypy>=0.970", - "decorator", - "pyyaml", -- "chevron", -+ "jinja2", - "regex", - "packaging", - ] diff --git a/dev-python/pytest-mypy-plugins/pytest-mypy-plugins-1.11.1.ebuild b/dev-python/pytest-mypy-plugins/pytest-mypy-plugins-1.11.1.ebuild deleted file mode 100644 index e42608e0e..000000000 --- a/dev-python/pytest-mypy-plugins/pytest-mypy-plugins-1.11.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_11 ) -inherit distutils-r1 - -DESCRIPTION="pytest plugin for testing mypy types, stubs, plugins" -HOMEPAGE=" - https://pypi.org/project/pytest-mypy-plugins/ - https://github.com/typeddjango/pytest-mypy-plugins/ -" - -SRC_URI="https://github.com/typeddjango/pytest-mypy-plugins/archive/refs/tags/${PV}.tar.gz - -> ${P}.gh.tar.gz" -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -PATCHES=( - "${FILESDIR}"/${P}-deprecated-chevron-to-jinja.patch -) - -DOCS="README* CHANGELOG*" - -RDEPEND=" - dev-python/decorator[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/mypy[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/regex[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest
