From fd1ea0a53f74daa4fd860ac35a20ba1817fd20fa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Dec 2023 17:12:21 +0000 Subject: gentoo auto-resync : 09:12:2023 - 17:12:21 --- dev-python/rich/Manifest | 9 +-- dev-python/rich/files/rich-13.7.0-nocolor.patch | 51 +++++++++++++++++ dev-python/rich/rich-13.5.2.ebuild | 65 ---------------------- dev-python/rich/rich-13.5.3.ebuild | 74 ------------------------- dev-python/rich/rich-13.6.0.ebuild | 55 ------------------ dev-python/rich/rich-13.7.0.ebuild | 7 ++- 6 files changed, 59 insertions(+), 202 deletions(-) create mode 100644 dev-python/rich/files/rich-13.7.0-nocolor.patch delete mode 100644 dev-python/rich/rich-13.5.2.ebuild delete mode 100644 dev-python/rich/rich-13.5.3.ebuild delete mode 100644 dev-python/rich/rich-13.6.0.ebuild (limited to 'dev-python/rich') diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest index 933a72db2471..8db9b1559ab9 100644 --- a/dev-python/rich/Manifest +++ b/dev-python/rich/Manifest @@ -1,11 +1,6 @@ +AUX rich-13.7.0-nocolor.patch 1570 BLAKE2B a8842324bdcf457356c2fb14a5fc6dfb7825fde1fcce84e362e50fd0deff3ccb5eeca9b7fe6ae3a45b9ea0d8ca3a73a06c0eba7dad4612cf986f81821d883f8c SHA512 7893b9142a89b6bf5ce4fb15ba82a65fdae52c44e6dd99240a6bd169327fe3d94c7a7c9dbaec0b001c2dcaedec743111a849ce9c607e67440dd9b64caae62885 DIST rich-13.4.2.gh.tar.gz 15063000 BLAKE2B f65079440bc7d89a3ff03be01fa71e076493ae50f22ae8781be2448a7ff2769c174d6654db3a835d34720c34cd8cbecfdd6b13e3064cf7fdcade71806563309d SHA512 17052a9fb0e1d89b31a00d8a719214719891d048fd805185b2d4258c8766130f44bf2280c9567bc162f3b34d9bf2eb7d747d6a37d910c81cd53d3003b51f70bd -DIST rich-13.5.2.gh.tar.gz 15064941 BLAKE2B 64f7e879588c42db9ac4f2173647143722c1de4865479b975ac5362e8073f60b493193abb0f50fb0d85923fdbe4145b2331fff7564ab78e3b43bc3a1be9d461c SHA512 60dfc66836f277763695611f6a3890da21afbb84bd85f38952efdac78680a8e3faca2e8c0aa937d618f876df1f36d3e67986979aa4fa9b6cb7dfb214f348b8aa -DIST rich-13.5.3.gh.tar.gz 15065440 BLAKE2B cba268b36499c0f65980ba7b7ce327c53d598b856a39e6c69989b55d488eb0bbe305b6ebf1ca0370251aa8f9ec7dacc6bdee612587a9ace9c66f19d91fdc20b8 SHA512 acae49b796c8ff310b272bca43ce925fe717ddc6252dec20784a4730e63e9c0f81f459ee40b152c001ad0a512e47dddaadbb8fbb949ced262e2d5429b6396344 -DIST rich-13.6.0.gh.tar.gz 15055370 BLAKE2B f9182d45ee5ebd802e0b5a02de7a8c27b98770fc97be7ad098aa0c77076bfe38af8d9434bcf961dd300718e1f4e14ee8bf669a89e8f7a24cd4d9817e11552f81 SHA512 6b954205b3cf5f2b7afd35b2b4f022c973206c8073e6c3f20979e015ebd64359576962d5bd3b29e5feb1dfed54f72def6c7c5d51d7940ed280022cf273b515ec DIST rich-13.7.0.gh.tar.gz 15057791 BLAKE2B d474b5817c0e64143313a1d0b66ef0953990196ecef6b0fd62d82828902008fa7293290c7f43c605a0c897ecebecb84e816583da8921cd31fc56c902ead2f5c9 SHA512 c5c432bd73b0c28d9585bce2e122d6b9da0a0744ea7824b4682948f11e153dfc615f5ed94d9531ced422298d352371fba5f25ddf16ca7a1d669f799ab361d984 EBUILD rich-13.4.2.ebuild 1818 BLAKE2B 100be0b0f6d3f00a867be57b132e05bc831a283373ebb46b92afd2d6cfd6b636b82b2e91ff956787dd18d6d115293f1b65d8ba2f12e6206ebbd2376286942a71 SHA512 162391cb1f36d42388e95f51dea9c0a5f499cb0bba2659444c15aba84971dc8a4324aa4dafa3ca31c8eb4d92e223fd5a4c71b858933f536b99633608c32b3464 -EBUILD rich-13.5.2.ebuild 1818 BLAKE2B 100be0b0f6d3f00a867be57b132e05bc831a283373ebb46b92afd2d6cfd6b636b82b2e91ff956787dd18d6d115293f1b65d8ba2f12e6206ebbd2376286942a71 SHA512 162391cb1f36d42388e95f51dea9c0a5f499cb0bba2659444c15aba84971dc8a4324aa4dafa3ca31c8eb4d92e223fd5a4c71b858933f536b99633608c32b3464 -EBUILD rich-13.5.3.ebuild 2293 BLAKE2B 0796e63e8486af131e2fc77335b89b8ac63a77e660f6d961ff449ba21ad5f3e8c24378824e28f582bf53ee013515d2479b81527709f7afbed589780eb5a67690 SHA512 60b2132570df7a38977ad8a683971e149b5f2b651044b28042337b5cc8bd6c77dc520bbddad8905a5928adc37ab7e4729bb3cb8dfaaf55461868cd9feb6501ed -EBUILD rich-13.6.0.ebuild 1305 BLAKE2B 2d4663a112277c5df5dc47a2014e1b835b525bb2af2933526d13b40134b8ddeb88428f2c321779c284a70c5572238094c3f4aae19875b6b51d96cb09d9d4aa96 SHA512 5210785967a748bb137fb09a7aa9a2ca7a612b72f3f83d4ef6f6b935badf4e9a645073d7706a545a23e96dbbd6167d43dc565ff35a4c318ae9905cf0a82f9cff -EBUILD rich-13.7.0.ebuild 1400 BLAKE2B bcfc51bb60c382bab0f8b9c037169eee08a4bc84d15ee9ca8be733d5ff2b39a7cc28390fca2a2fd24ecbeee64d309ecef7b058af8e069fc02b7aac54c0a072c0 SHA512 d7c4bb0e06ea3cb850c7a9ddf7197c32eabc1852497c91b151011079170c47990a86715f40c5fa929151c071d78f27a44e11e6508aeea8b77fbbd706c39600e2 +EBUILD rich-13.7.0.ebuild 1487 BLAKE2B 424f2523e12a4869a002a30e64cb42cb3de7fee24e4f0bc269be7afe44c58f58793f96febc84901095dfbc0a597dc7e7a2097a2db6f151f42c965c3ceb5078ee SHA512 d879b0df4e21f6b4ba4ddcf548f854d0de2e599d8fe125d955f580d2973e0bb37e40919c8c83f35ad34e5f04a46212b9763d24d1e362a63a477c98cbf8091f5d MISC metadata.xml 387 BLAKE2B 049491e034ba233f33c76dc5e3f1b887ba5d2da9d65b09bda51a7cf4eb30a9c66f3ddf714f52407a73e51da78523084064bccd4fc687e0bc0fc2b32dbb4c513b SHA512 448ce879331748e3166f670981a27ee5c3ef20b51af442ccc684cb6514c0d6a0d4e433a8bc1ddb3bdf68c734bac013c1ba04d38adf90644b062231ab1c1d2c0b diff --git a/dev-python/rich/files/rich-13.7.0-nocolor.patch b/dev-python/rich/files/rich-13.7.0-nocolor.patch new file mode 100644 index 000000000000..77aafa8294d1 --- /dev/null +++ b/dev-python/rich/files/rich-13.7.0-nocolor.patch @@ -0,0 +1,51 @@ +From 7d79acbabf3d9836a4bd9e7296d6f6dd6a222fb7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Sat, 9 Dec 2023 15:25:21 +0100 +Subject: [PATCH] Fix running tests in environment with FORCE_COLOR or NO_COLOR + set + +Ensure to unset FORCE_COLOR and NO_COLOR environment variables within +the scope of individual tests, in order to fix test failures when these +variables are set in the environment where tests are run, e.g. via: + + NO_COLOR=1 tox +--- + CHANGELOG.md | 6 ++++++ + tests/conftest.py | 8 ++++++++ + 2 files changed, 14 insertions(+) + create mode 100644 tests/conftest.py + +diff --git a/CHANGELOG.md b/CHANGELOG.md +index 9b0eecd7..af7354b4 100644 +--- a/CHANGELOG.md ++++ b/CHANGELOG.md +@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. + The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), + and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + ++## Unreleased ++ ++### Fixed ++ ++- Running tests in environment with `FORCE_COLOR` or `NO_COLOR` environment variables ++ + ## [13.7.0] - 2023-11-15 + + ### Added +diff --git a/tests/conftest.py b/tests/conftest.py +new file mode 100644 +index 00000000..52662964 +--- /dev/null ++++ b/tests/conftest.py +@@ -0,0 +1,8 @@ ++import pytest ++ ++ ++@pytest.fixture(autouse=True) ++def reset_color_envvars(monkeypatch): ++ """Remove color-related envvars to fix test output""" ++ monkeypatch.delenv("FORCE_COLOR", raising=False) ++ monkeypatch.delenv("NO_COLOR", raising=False) +-- +2.43.0 + diff --git a/dev-python/rich/rich-13.5.2.ebuild b/dev-python/rich/rich-13.5.2.ebuild deleted file mode 100644 index 7d07d7e5e93f..000000000000 --- a/dev-python/rich/rich-13.5.2.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=poetry -PYTHON_COMPAT=( python3_{10..12} pypy3 ) - -inherit distutils-r1 optfeature - -DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal" -HOMEPAGE=" - https://github.com/Textualize/rich/ - https://pypi.org/project/rich/ -" -SRC_URI=" - https://github.com/Textualize/rich/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" - -RDEPEND=" - dev-python/colorama[${PYTHON_USEDEP}] - >=dev-python/markdown-it-py-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pygments-2.13.0[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest - -python_test() { - local -x COLUMNS=80 - local EPYTEST_DESELECT=( - # TODO - tests/test_console.py::test_size_can_fall_back_to_std_descriptors - tests/test_inspect.py::test_inspect_integer_with_methods_python38_and_python39 - # pygments? - tests/test_syntax.py::test_python_render_simple_indent_guides - tests/test_syntax.py::test_python_render_line_range_indent_guides - ) - # version-specific output -- the usual deal - case ${EPYTHON} in - pypy3) - EPYTEST_DESELECT+=( - # pypy3.10, to be more precise - tests/test_inspect.py::test_inspect_integer_with_methods_python310only - ) - ;; - python3.12) - EPYTEST_DESELECT+=( - tests/test_inspect.py::test_inspect_builtin_function_except_python311 - tests/test_inspect.py::test_inspect_integer_with_methods_python310only - tests/test_inspect.py::test_inspect_integer_with_methods_python311_and_above - tests/test_pretty.py::test_attrs_broken - ) - ;; - esac - epytest -p no:pytest-qt -} - -pkg_postinst() { - optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets -} diff --git a/dev-python/rich/rich-13.5.3.ebuild b/dev-python/rich/rich-13.5.3.ebuild deleted file mode 100644 index e6eb76070020..000000000000 --- a/dev-python/rich/rich-13.5.3.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=poetry -PYTHON_COMPAT=( python3_{10..12} pypy3 ) - -inherit distutils-r1 optfeature - -DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal" -HOMEPAGE=" - https://github.com/Textualize/rich/ - https://pypi.org/project/rich/ -" -SRC_URI=" - https://github.com/Textualize/rich/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - -RDEPEND=" - dev-python/colorama[${PYTHON_USEDEP}] - >=dev-python/markdown-it-py-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pygments-2.13.0[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest - -python_test() { - local -x COLUMNS=80 - local EPYTEST_DESELECT=( - # TODO - tests/test_console.py::test_size_can_fall_back_to_std_descriptors - tests/test_inspect.py::test_inspect_integer_with_methods_python38_and_python39 - # pygments? - tests/test_syntax.py::test_python_render_simple_indent_guides - tests/test_syntax.py::test_python_render_line_range_indent_guides - tests/test_card.py::test_card_render - tests/test_markdown.py::test_markdown_render - tests/test_markdown_no_hyperlinks.py::test_markdown_render - tests/test_syntax.py::test_python_render - tests/test_syntax.py::test_python_render_simple - tests/test_syntax.py::test_python_render_simple_passing_lexer_instance - tests/test_syntax.py::test_python_render_indent_guides - tests/test_syntax.py::test_option_no_wrap - tests/test_syntax.py::test_syntax_highlight_ranges - ) - # version-specific output -- the usual deal - case ${EPYTHON} in - pypy3) - EPYTEST_DESELECT+=( - # pypy3.10, to be more precise - tests/test_inspect.py::test_inspect_integer_with_methods_python310only - ) - ;; - python3.12) - EPYTEST_DESELECT+=( - tests/test_inspect.py::test_inspect_builtin_function_except_python311 - tests/test_inspect.py::test_inspect_integer_with_methods_python310only - tests/test_inspect.py::test_inspect_integer_with_methods_python311_and_above - tests/test_pretty.py::test_attrs_broken - ) - ;; - esac - epytest -p no:pytest-qt -} - -pkg_postinst() { - optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets -} diff --git a/dev-python/rich/rich-13.6.0.ebuild b/dev-python/rich/rich-13.6.0.ebuild deleted file mode 100644 index cdffd9766be3..000000000000 --- a/dev-python/rich/rich-13.6.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=poetry -PYTHON_COMPAT=( python3_{10..12} pypy3 ) - -inherit distutils-r1 optfeature - -DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal" -HOMEPAGE=" - https://github.com/Textualize/rich/ - https://pypi.org/project/rich/ -" -SRC_URI=" - https://github.com/Textualize/rich/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - -RDEPEND=" - dev-python/colorama[${PYTHON_USEDEP}] - >=dev-python/markdown-it-py-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pygments-2.13.0[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest - -python_test() { - local EPYTEST_DESELECT=( - # TODO - tests/test_console.py::test_size_can_fall_back_to_std_descriptors - ) - # version-specific output -- the usual deal - case ${EPYTHON} in - pypy3) - EPYTEST_DESELECT+=( - # pypy3.10, to be more precise - tests/test_inspect.py::test_inspect_integer_with_methods_python310only - ) - ;; - esac - - local -x COLUMNS=80 - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -} - -pkg_postinst() { - optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets -} diff --git a/dev-python/rich/rich-13.7.0.ebuild b/dev-python/rich/rich-13.7.0.ebuild index 856c2c6051b5..4e4bcc1af9e8 100644 --- a/dev-python/rich/rich-13.7.0.ebuild +++ b/dev-python/rich/rich-13.7.0.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" RDEPEND=" dev-python/colorama[${PYTHON_USEDEP}] @@ -30,6 +30,11 @@ RDEPEND=" distutils_enable_tests pytest +PATCHES=( + # https://github.com/Textualize/rich/pull/3226 + "${FILESDIR}/${P}-nocolor.patch" +) + python_test() { local EPYTEST_DESELECT=( # TODO -- cgit v1.2.3