From 391bc1ea006428d5f5d004e15da41ecfb54c11c5 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Mon, 26 Feb 2024 18:40:22 +0000 Subject: Adding metadata --- dev-python/pytest-mypy-plugins/Manifest | 1 - ...test-mypy-plugins-3.0.0-compat-mypy-1.8.0.patch | 51 +++++++++++++++++++++ .../pytest-mypy-plugins-2.0.0.ebuild | 39 ---------------- .../pytest-mypy-plugins-3.0.0-r1.ebuild | 52 ++++++++++++++++++++++ .../pytest-mypy-plugins-3.0.0.ebuild | 52 ---------------------- 5 files changed, 103 insertions(+), 92 deletions(-) create mode 100644 dev-python/pytest-mypy-plugins/files/pytest-mypy-plugins-3.0.0-compat-mypy-1.8.0.patch delete mode 100644 dev-python/pytest-mypy-plugins/pytest-mypy-plugins-2.0.0.ebuild create mode 100644 dev-python/pytest-mypy-plugins/pytest-mypy-plugins-3.0.0-r1.ebuild delete mode 100644 dev-python/pytest-mypy-plugins/pytest-mypy-plugins-3.0.0.ebuild (limited to 'dev-python/pytest-mypy-plugins') diff --git a/dev-python/pytest-mypy-plugins/Manifest b/dev-python/pytest-mypy-plugins/Manifest index 97df09184cf2..35c418d5773e 100644 --- a/dev-python/pytest-mypy-plugins/Manifest +++ b/dev-python/pytest-mypy-plugins/Manifest @@ -1,2 +1 @@ -DIST pytest-mypy-plugins-2.0.0.gh.tar.gz 18444 BLAKE2B a9def96003d85d76984067194abdbb5259379c09d359be6a3de7d4a68df2f8c7ebd033632c645297062564943b6cdee885c793172338b52110590be6911f6a75 SHA512 743d88884e3eef03cb52ffde82e42522ea961db6a27be3cba17aadceb47e1456ffd20806559dd7a6b183536aba98e592e97e40911199c4defbe66bfceebbf229 DIST pytest-mypy-plugins-3.0.0.gh.tar.gz 20643 BLAKE2B e9b124b23f0e606b8d6f098c5834f8b70b44a6d7f374b0d4132c1fc47429a7a72a98ac96edd61a21969d4bc46a27c49cda35a9e0f71ed93361e0346debe643af SHA512 a2c35b4b57cf8eff6ac303a7394f798e3b96359c1e0e6424d57f0c5680cf00b6e84b7a11bb138c4ab3c7464f13ad0fd6358e9f2c5957b36eec1d2835e31edcd7 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 new file mode 100644 index 000000000000..c39c21d2ed6f --- /dev/null +++ b/dev-python/pytest-mypy-plugins/files/pytest-mypy-plugins-3.0.0-compat-mypy-1.8.0.patch @@ -0,0 +1,51 @@ +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-2.0.0.ebuild b/dev-python/pytest-mypy-plugins/pytest-mypy-plugins-2.0.0.ebuild deleted file mode 100644 index 01f5f68afe91..000000000000 --- a/dev-python/pytest-mypy-plugins/pytest-mypy-plugins-2.0.0.ebuild +++ /dev/null @@ -1,39 +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_{8,9,10,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" - -DOCS="README* CHANGELOG*" - -RDEPEND=" - >=dev-python/mypy-1.3.0[${PYTHON_USEDEP}] - >=dev-python/pytest-7.0.0[${PYTHON_USEDEP}] - dev-python/decorator[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/regex[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest - -python_test() { - # --mypy-only-local-stub is a workaround for bug #921901 - epytest --mypy-only-local-stub -} 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 new file mode 100644 index 000000000000..203c787cd067 --- /dev/null +++ b/dev-python/pytest-mypy-plugins/pytest-mypy-plugins-3.0.0-r1.ebuild @@ -0,0 +1,52 @@ +# 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_{8,9,10,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}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/regex[${PYTHON_USEDEP}] +" + +distutils_enable_tests pytest + +python_prepare_all() { + # tests need pytest_mypy_plugins.tests on the modules search path and + # python -m pytest preprends sys.path with ${PWD}/${S} + sed "s/\"pytest\"/\"MY_EPYTHON\", \"-m\", \"pytest\"/" \ + -i pytest_mypy_plugins/tests/test_explicit_configs.py || die + distutils-r1_python_prepare_all +} + +python_test() { + # substitute the correct interpreter + sed "s/MY_EPYTHON/${EPYTHON}/" -i pytest_mypy_plugins/tests/test_explicit_configs.py || die + distutils-r1_python_test + # reset for next interpreter run + sed "s/${EPYTHON}/MY_EPYTHON/" -i pytest_mypy_plugins/tests/test_explicit_configs.py || die +} diff --git a/dev-python/pytest-mypy-plugins/pytest-mypy-plugins-3.0.0.ebuild b/dev-python/pytest-mypy-plugins/pytest-mypy-plugins-3.0.0.ebuild deleted file mode 100644 index eddc082aaf5c..000000000000 --- a/dev-python/pytest-mypy-plugins/pytest-mypy-plugins-3.0.0.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_{8,9,10,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" - -DOCS="README* CHANGELOG*" - -RDEPEND=" - >=dev-python/mypy-1.3.0[${PYTHON_USEDEP}] - >=dev-python/pytest-7.0.0[${PYTHON_USEDEP}] - >=dev-python/tomlkit-0.11[${PYTHON_USEDEP}] - dev-python/decorator[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/regex[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest - -python_prepare_all() { - # tests need pytest_mypy_plugins.tests on the modules search path and - # python -m pytest preprends sys.path with ${PWD}/${S} - # --mypy-only-local-stub is a workaround for bug #921901 - sed "s/\"pytest\"/\"MY_EPYTHON\", \"-m\", \"pytest\", \"--mypy-only-local-stub\"/" \ - -i pytest_mypy_plugins/tests/test_explicit_configs.py || die - distutils-r1_python_prepare_all -} - -python_test() { - # substitute the correct interpreter - sed "s/MY_EPYTHON/${EPYTHON}/" -i pytest_mypy_plugins/tests/test_explicit_configs.py || die - epytest --mypy-only-local-stub - # reset for next interpreter run - sed "s/${EPYTHON}/MY_EPYTHON/" -i pytest_mypy_plugins/tests/test_explicit_configs.py || die -} -- cgit v1.3.1