[gentoo-commits] repo/proj/guru:dev commit in: dev-python/pytest-mypy-plugins/, dev-python/pytest-mypy-plugins/files/
commit: 794a9be72a029e607fc38615911e3a7fe4794155 Author: Lucio Sauer posteo net> AuthorDate: Fri Mar 1 23:18:54 2024 + Commit: Lucio Sauer posteo net> CommitDate: Fri Mar 1 23:18:54 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=794a9be7 dev-python/pytest-mypy-plugins: drop 3.0.0-r1 Signed-off-by: Lucio Sauer posteo.net> dev-python/pytest-mypy-plugins/Manifest| 1 - ...test-mypy-plugins-3.0.0-compat-mypy-1.8.0.patch | 51 - .../pytest-mypy-plugins-3.0.0-r1.ebuild| 52 -- 3 files changed, 104 deletions(-) diff --git a/dev-python/pytest-mypy-plugins/Manifest b/dev-python/pytest-mypy-plugins/Manifest index a4509d2f93..a09bb2ad31 100644 --- a/dev-python/pytest-mypy-plugins/Manifest +++ b/dev-python/pytest-mypy-plugins/Manifest @@ -1,2 +1 @@ -DIST pytest-mypy-plugins-3.0.0.gh.tar.gz 20643 BLAKE2B e9b124b23f0e606b8d6f098c5834f8b70b44a6d7f374b0d4132c1fc47429a7a72a98ac96edd61a21969d4bc46a27c49cda35a9e0f71ed93361e0346debe643af SHA512 a2c35b4b57cf8eff6ac303a7394f798e3b96359c1e0e6424d57f0c5680cf00b6e84b7a11bb138c4ab3c7464f13ad0fd6358e9f2c5957b36eec1d2835e31edcd7 DIST pytest-mypy-plugins-3.1.0.gh.tar.gz 24331 BLAKE2B b4cae94e254f8da0ef8cd081479cbee4522150843ef3bbbd16ae6efe6722e44e84aa49e761e99699b75c94f8b44963e8f9eeefb5c5b3352411df4801a1bbc5b4 SHA512 4892b653b9cd2bbe5cd253c5f0472d48a6eaf5e1261d53ef0f1c53470c2589baf21d428a0873c64acca71eec38ef9653ec501e0746ffc564d30830ba68148f91 diff --git a/dev-python/pytest-mypy-plugins/files/pytest-mypy-plugins-3.0.0-compat-mypy-1.8.0.patch b/dev-python/pytest-mypy-plugins/files/pytest-mypy-plugins-3.0.0-compat-mypy-1.8.0.patch deleted file mode 100644 index c39c21d2ed..00 --- a/dev-python/pytest-mypy-plugins/files/pytest-mypy-plugins-3.0.0-compat-mypy-1.8.0.patch +++ /dev/null @@ -1,51 +0,0 @@ -https://github.com/typeddjango/pytest-mypy-plugins/commit/97aff1e9ae5022384542ce98b8a401c7f4c420e7 -From: antecrescent -Date: Sun, 25 Feb 2024 20:53:26 +0100 -Subject: [PATCH] Test inline mypy configuration with more stable mypy option - (#138) - -* Test inline mypy configuration with more stable mypy option - -The mypy configuration --no-strict-optional is discouraged and not much -tested. It caused the test to fail with >=mypy-1.6.0. - -Closes #137 - -* Update flush_errors to match the signature of >=mypy-1.8.0 - -Necessity to bump to >=mypy-1.8.0 explained here: -https://github.com/typeddjango/pytest-mypy-plugins/pull/139 a/pytest_mypy_plugins/item.py -+++ b/pytest_mypy_plugins/item.py -@@ -82,7 +82,10 @@ def run_mypy_typechecking(cmd_options: List[str], stdout: TextIO, stderr: TextIO - - error_messages = [] - --def flush_errors(new_messages: List[str], serious: bool) -> None: -+# discard filename parameter '_'. Mypy uses it to generate -+# one junit-xml test entry per file with failures (--junit-format per_file) -+# and we don't support mypy's --junit-xml option in the first place. -+def flush_errors(_: str | None, new_messages: List[str], serious: bool) -> None: - error_messages.extend(new_messages) - f = stderr if serious else stdout - try: a/pytest_mypy_plugins/tests/test-mypy-config.yml -+++ b/pytest_mypy_plugins/tests/test-mypy-config.yml -@@ -1,9 +1,9 @@ - # Also used in `test_explicit_configs.py` - --- case: custom_mypy_config_strict_optional_true_set -+- case: custom_mypy_config_disallow_any_explicit_set -+ expect_fail: yes - main: | --from typing import Optional --a: Optional[int] = None --a + 1 # should not raise an error -+from typing import Any -+a: Any = None # should raise an error - mypy_config: | --strict_optional = false -+disallow_any_explicit = true --- -2.43.2 - diff --git a/dev-python/pytest-mypy-plugins/pytest-mypy-plugins-3.0.0-r1.ebuild b/dev-python/pytest-mypy-plugins/pytest-mypy-plugins-3.0.0-r1.ebuild deleted file mode 100644 index 2564816f26..00 --- a/dev-python/pytest-mypy-plugins/pytest-mypy-plugins-3.0.0-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{11,12} ) -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}-compat-mypy-1.8.0.patch -DOCS="README* CHANGELOG*" - -RDEPEND=" - >=dev-python/mypy-1.8.0[${PYTHON_USEDEP}] - >=dev-python/pytest-7.0.0[${PYTHON_USEDEP}] - >=dev-python/tomlkit-0.11[${PYTHON_USEDEP}] - dev-python/decorator[${PYTHON_USEDEP}] -
[gentoo-commits] repo/proj/guru:dev commit in: dev-python/pytest-mypy-plugins/, dev-python/pytest-mypy-plugins/files/
commit: 05fc9520f54b1101e82b7d20a93b1a8f60c859e7 Author: Lucio Sauer posteo net> AuthorDate: Fri Jun 30 21:11:41 2023 + Commit: Lucio Sauer posteo net> CommitDate: Fri Jun 30 21:13:18 2023 + 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 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 743d4e3eef03cb52ffde82e42522ea961db6a27be3cba17aadceb47e1456ffd20806559dd7a6b183536aba98e592e97e40911199c4defbe66bfceebbf229 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..0 --- 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 : -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..0 --- 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
[gentoo-commits] repo/proj/guru:dev commit in: dev-python/pytest-mypy-plugins/, dev-python/pytest-mypy-plugins/files/
commit: b21c536c3e239ba404e39db369fe41d978bb80e9 Author: Lucio Sauer posteo net> AuthorDate: Mon May 22 00:42:59 2023 + Commit: Lucio Sauer posteo net> CommitDate: Mon May 22 00:44:37 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b21c536c dev-python/pytest-mypy-plugins: new package, add 1.11.1 Signed-off-by: Lucio Sauer posteo.net> dev-python/pytest-mypy-plugins/Manifest| 1 + ...lugins-1.11.1-deprecated-chevron-to-jinja.patch | 45 ++ dev-python/pytest-mypy-plugins/metadata.xml| 19 + .../pytest-mypy-plugins-1.11.1.ebuild | 37 ++ 4 files changed, 102 insertions(+) diff --git a/dev-python/pytest-mypy-plugins/Manifest b/dev-python/pytest-mypy-plugins/Manifest new file mode 100644 index 0..1e72cbeeb --- /dev/null +++ b/dev-python/pytest-mypy-plugins/Manifest @@ -0,0 +1 @@ +DIST pytest-mypy-plugins-1.11.1.gh.tar.gz 18201 BLAKE2B a21b089321a3d632225e0ac6aa921b23bba111dcc5234c2ada32522b7659533970a9bd19bb432d3304b0291e32ba067ab75c549c4552ca742835155ab8e711b1 SHA512 ac7a0973aba070c80480681f2910d40c7e510c906f8030413ba5c94f50131df19036c7183bfad3f211d6d375661753b9d4ff2a73b3bd7af06d0f442e94af3f64 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 new file mode 100644 index 0..ae2885893 --- /dev/null +++ b/dev-python/pytest-mypy-plugins/files/pytest-mypy-plugins-1.11.1-deprecated-chevron-to-jinja.patch @@ -0,0 +1,45 @@ +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 : +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/metadata.xml b/dev-python/pytest-mypy-plugins/metadata.xml new file mode 100644 index 0..e6717ac2f --- /dev/null +++ b/dev-python/pytest-mypy-plugins/metadata.xml @@ -0,0 +1,19 @@ + +https://www.gentoo.org/dtd/metadata.dtd;> + + +watermanpa...@posteo.net +Lucio Sauer + + +proxy-ma...@gentoo.org +Proxy Maintainers + + + + https://github.com/typeddjango/pytest-mypy-plugins/blob/master/CHANGELOG.md + +typeddjango/pytest-mypy-plugins +pytest-mypy-plugins + + 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 new file mode 100644 index 0..e42608e0e --- /dev/null +++ b/dev-python/pytest-mypy-plugins/pytest-mypy-plugins-1.11.1.ebuild @@ -0,0 +1,37 @@ +# 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}] +