diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-11-19 17:06:50 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-11-19 17:06:50 +0000 |
commit | 5a31d854eec302fd1efb1466af757e520ae4e1dc (patch) | |
tree | 58a9a7036a479519c2b853ff7646e69d1c6a2339 /eclass | |
parent | 8c58ead574346296889d58006e1bf184da00be3a (diff) |
gentoo auto-resync : 19:11:2023 - 17:06:49
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/Manifest.gz | bin | 38791 -> 38783 bytes | |||
-rw-r--r-- | eclass/distutils-r1.eclass | 3 | ||||
-rw-r--r-- | eclass/llvm.org.eclass | 3 | ||||
-rw-r--r-- | eclass/python-utils-r1.eclass | 61 |
4 files changed, 41 insertions, 26 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 3dd3f9b96bb3..3426b1391270 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 3d756eaad556..0a7b18e4a1a4 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -1813,6 +1813,9 @@ distutils-r1_run_phase() { local -x CYTHON_FORCE_REGEN=1 fi + # silence warnings when pydevd is loaded on Python 3.11+ + local -x PYDEVD_DISABLE_FILE_VALIDATION=1 + # Rust extensions are incompatible with C/C++ LTO compiler # see e.g. https://bugs.gentoo.org/910220 if has cargo ${INHERITED}; then diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass index 54a2427c6b4d..ad6c35848bc4 100644 --- a/eclass/llvm.org.eclass +++ b/eclass/llvm.org.eclass @@ -72,6 +72,9 @@ if [[ -z ${_LLVM_SOURCE_TYPE+1} ]]; then _LLVM_SOURCE_TYPE=snapshot case ${PV} in + 18.0.0_pre20231119) + EGIT_COMMIT=5237193b87721134541f228e28edfd544a9c8ac8 + ;; 18.0.0_pre20231111) EGIT_COMMIT=167b598648dfcee2f23426bfa972e53f8ac16722 ;; diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 80abe974f9df..394f64a5d139 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -1362,38 +1362,47 @@ epytest() { # count is more precise when we're dealing with a large number # of tests -o console_output_style=count - # disable the undesirable-dependency plugins by default to - # trigger missing argument strips. strip options that require - # them from config files. enable them explicitly via "-p ..." - # if you *really* need them. - -p no:cov - -p no:flake8 - -p no:flakes - -p no:pylint - # sterilize pytest-markdown as it runs code snippets from all - # *.md files found without any warning - -p no:markdown - # pytest-sugar undoes everything that's good about pytest output - # and makes it hard to read logs - -p no:sugar - # pytest-xvfb automatically spawns Xvfb for every test suite, - # effectively forcing it even when we'd prefer the tests - # not to have DISPLAY at all, causing crashes sometimes - # and causing us to miss missing virtualx usage - -p no:xvfb - # intrusive packages that break random test suites - -p no:pytest-describe - -p no:plus - -p no:tavern ) + if [[ ! ${PYTEST_DISABLE_PLUGIN_AUTOLOAD} ]]; then + args+=( + # disable the undesirable-dependency plugins by default to + # trigger missing argument strips. strip options that require + # them from config files. enable them explicitly via "-p ..." + # if you *really* need them. + -p no:cov + -p no:flake8 + -p no:flakes + -p no:pylint + # sterilize pytest-markdown as it runs code snippets from all + # *.md files found without any warning + -p no:markdown + # pytest-sugar undoes everything that's good about pytest output + # and makes it hard to read logs + -p no:sugar + # pytest-xvfb automatically spawns Xvfb for every test suite, + # effectively forcing it even when we'd prefer the tests + # not to have DISPLAY at all, causing crashes sometimes + # and causing us to miss missing virtualx usage + -p no:xvfb + # intrusive packages that break random test suites + -p no:pytest-describe + -p no:plus + -p no:tavern + ) + fi + if [[ ${EPYTEST_XDIST} ]]; then local jobs=${EPYTEST_JOBS:-$(makeopts_jobs)} if [[ ${jobs} -gt 1 ]]; then + if [[ ${PYTEST_PLUGINS} != *xdist.plugin* ]]; then + args+=( + # explicitly enable the plugin, in case the ebuild was + # using PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + -p xdist + ) + fi args+=( - # explicitly enable the plugin, in case the ebuild was using - # PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - -p xdist -n "${jobs}" # worksteal ensures that workers don't end up idle when heavy # jobs are unevenly distributed |