gentoo resync : 03.09.2021

3 files changed, 64 insertions, 0 deletions

diff --git a/dev-python/xdoctest/Manifest b/dev-python/xdoctest/Manifest
index 49031c741e47..5dbfd53732eb 100644
--- a/dev-python/xdoctest/Manifest
+++ b/dev-python/xdoctest/Manifest
@@ -1,5 +1,8 @@
+AUX xdoctest-0.15.8-pytest-flaky.patch 1126 BLAKE2B a96a688165b8781ce189f8963df89e6ee61b6f53508c78de0b95ab8c519ab5d618a835a78c21abe23d79d34cdd9c7b677430ff3bacb05d26c439afbaf886288d SHA512 20749730d000d50a80c660e536be465463d08162788c470f51721fd793e9cee9eb0138e1c82979dbed67976aec6041adc55c33f8d518ec9cd9eff2652ad8f56c
 DIST xdoctest-0.15.4.gh.tar.gz 179295 BLAKE2B 0b44276a219119196543671d8ac24469ecd73b040bbd03ca416320d407f0dd34361dbb2778121621f6efb65835ea421107883277b6e712f03e4c06ea2b03dd6a SHA512 a0a35d5c73a8696266d9be44d11e9dbf05c9ac1165a05e681f7b70ef07ae7d56f4bd179e863b6675e2366f1627015e92092e8250ca592f004680db5ad886ad49
 DIST xdoctest-0.15.6.gh.tar.gz 182717 BLAKE2B 39af1bdc381e6b6044321ca1dae8ae893d4af9ba8d595ce5dad0fea7e805420635bc9f9a2c04726cb03a7fa0311eb1df1f93aa59e682790e15a3e119356d7b9a SHA512 5c7a7cfea9a7b37e8e5a383b59896730420dbf737a4217bd19ebe083b48a6d410b0e6713b0e5b9749527ff3992f3d24b83d49622bcde0a68722ecab8337d7040
+DIST xdoctest-0.15.8.gh.tar.gz 185463 BLAKE2B a16578e6d50398ac80d950bcc9a05131880816e2ff3a15bd1489474e532f9b495d099dcea204d8375c884c6957aaaba9b276fbcb65b5717b2850314453f787f7 SHA512 ab4f991ba6e312bf6cf675c3bbeeae87c0666b96c911ee7727f64b8e4c13420bb91e0a7a955ebce73b3fb15625b52bbf1b67c6edfe91234655501060b17723d5
 EBUILD xdoctest-0.15.4.ebuild 764 BLAKE2B ba6b768d79fc4a40ce81421c6dfa93900a96e924ed2326a67c281cd49bb5f9cbc82b5f80298ffda49d58dac76748ffa27d21af0cf65e32567467386a4b282da7 SHA512 a0e7c30ca728b68c79e1fec5cbd5079365a369ea44a087e1602e419cb045de5b800b254af017e15d859f104f9b35b468cad6ef8381df40f28fca72653c0fb586
 EBUILD xdoctest-0.15.6.ebuild 764 BLAKE2B ba6b768d79fc4a40ce81421c6dfa93900a96e924ed2326a67c281cd49bb5f9cbc82b5f80298ffda49d58dac76748ffa27d21af0cf65e32567467386a4b282da7 SHA512 a0e7c30ca728b68c79e1fec5cbd5079365a369ea44a087e1602e419cb045de5b800b254af017e15d859f104f9b35b468cad6ef8381df40f28fca72653c0fb586
+EBUILD xdoctest-0.15.8.ebuild 816 BLAKE2B 12f0e5958db5867207f0d971788601d0e8354fb29e5f4e1b908fd55ada84c0946d61e94152a99b5832453c580e1898e36af677da0eecb72a2cccc98c37cc7931 SHA512 651a24d1ebcbd6168ae4f50c7e5283f654c048a8106b40a416e24d7c9863d600e181f69eb97f2db91122bee99c0ed1b65aa4190820f5a0a9cb772f17afea936e
 MISC metadata.xml 425 BLAKE2B ef6df66f437f7b59189999a895fde27e87580c6eff536aa9b80855b7db9e83c2a0edbaa4784f9438846800b89eac58857c4c303752d1110f86d43194fdee21f9 SHA512 81c57c3abf70d2fc182b5d935ae35187e2f5a9a99b3a5958c282f478fceb0283ee2c09ebe2561da8753dca35c73f54ec3fa17d29ecefd7c50f3c8b7bf42f9657
diff --git a/dev-python/xdoctest/files/xdoctest-0.15.8-pytest-flaky.patch b/dev-python/xdoctest/files/xdoctest-0.15.8-pytest-flaky.patch
new file mode 100644
index 000000000000..193b3f51bbac
--- /dev/null
+++ b/dev-python/xdoctest/files/xdoctest-0.15.8-pytest-flaky.patch
@@ -0,0 +1,28 @@
+From ec14218904fdd1c06597277deb11c8d3bb33c675 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 3 Sep 2021 07:27:22 +0200
+Subject: [PATCH] Fix test failure if pytest's flaky plugin is installed
+
+Disable pytest's flaky plugin in test_simple_pytest_import_error_cli
+in order to fix a test failure due to it mangling pytest's return code
+on import error.
+---
+ testing/test_pytest_cli.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/testing/test_pytest_cli.py b/testing/test_pytest_cli.py
+index 25c8363..8ef9251 100644
+--- a/testing/test_pytest_cli.py
++++ b/testing/test_pytest_cli.py
+@@ -67,7 +67,7 @@ def test_simple_pytest_import_error_cli():
+             """
+         ''')
+     temp_module = util_misc.TempModule(module_text, modname='imperr_test_mod')
+-    command = sys.executable + ' -m pytest -v -s --xdoctest-verbose=3 --xdoctest ' + temp_module.dpath
++    command = sys.executable + ' -m pytest -p no:flaky -v -s --xdoctest-verbose=3 --xdoctest ' + temp_module.dpath
+     print(command)
+     info = cmd(command)
+     print(info['out'])
+-- 
+2.33.0
+
diff --git a/dev-python/xdoctest/xdoctest-0.15.8.ebuild b/dev-python/xdoctest/xdoctest-0.15.8.ebuild
new file mode 100644
index 000000000000..2fca586c7c28
--- /dev/null
+++ b/dev-python/xdoctest/xdoctest-0.15.8.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A rewrite of Python's builtin doctest module but without all the weirdness"
+HOMEPAGE="https://github.com/Erotemic/xdoctest/"
+SRC_URI="
+	https://github.com/Erotemic/xdoctest/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+# dev-python/nbformat-5.1.{0..2} did not install package data
+BDEPEND="
+	test? (
+		>=dev-python/nbformat-5.1.2-r1[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+#distutils_enable_sphinx docs/source \
+#	dev-python/autoapi \
+#	dev-python/sphinx_rtd_theme
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pytest-flaky.patch
+)