gentoo auto-resync : 15:10:2024 - 04:04:09

3 files changed, 45 insertions, 12 deletions

diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest
index 9cbfe2c1777b..dc41f018d56f 100644
--- a/dev-python/pexpect/Manifest
+++ b/dev-python/pexpect/Manifest
@@ -1,3 +1,4 @@
+AUX pexpect-4.9.0-py313.patch 1787 BLAKE2B e3328efdf42a769bec2b718a5a563e810807bfca4b23931ba386a5aaf844b3eb2ae15f27dcfc1d7df073ec9203194e58684312e1d38dacf621ff8ebc12e2d695 SHA512 ac8f16a04943f279bd76accac79d74c95d620bc777a3f93807f1d0394dd02b238036868749086364257d3473adacd978e2498686ef22b2bbb20b0cff8ae5da57
 DIST pexpect-4.9.0.tar.gz 166450 BLAKE2B a08e10deb9f21e49a04021d78dc1ff6c9eeded5825ef73b236c3dac725e6877a4fe74deaa6844c8aa4b1beab4b915d7612e682529c4ed97b364a737a1960b30f SHA512 0e4b3a6978b94aee221ff23cd7bd771517e0e0f1a1a8b17f77f15bf78edd3130ad093d925b7d1e86fe6ba7eb956205d4c616b4e52b2fcfa1e944d4860dd7b3a0
-EBUILD pexpect-4.9.0.ebuild 1684 BLAKE2B b11134c1cdaad07b45fb6308adba71a040da503f83b3ac26af97f97c6a19ffc3e186386621053b52937c3d0c325f81a750cd1c400f254a923c5ca68277767a6e SHA512 56746ace0a22787cb817e2902512e95c83b6be92c385c7892a893a78a639c41b4e6e01d6786be6ac8fe6fc11b273e78550a479c091881d96b64aece984e7fdef
+EBUILD pexpect-4.9.0.ebuild 1543 BLAKE2B 4bb2faf8e8b455192c7b8270f32f16e8e25daf4f891c88b35ee8115b919c0ad0a8a7ac898e918a5fe33a2eb638cf47692f1696b7f8ac96592f94b4d79c81da3f SHA512 0aa4d7429cb8382de1bfe906e34471cabafed28487c47a94f669b6ee642e852f46333bfcaf85b1fe35e0842fe0ef26f6a14db84df17a1a37d84ac363f1825bbf
 MISC metadata.xml 403 BLAKE2B 0e07f64f32ee9f6776e53f5e59b91e0e22675ebb0e8c8b98eadfb9a46d29af3e7daaafbf4e60fd7fa20bf57d42619ebdf26994b087ed0773a943acd6fddc8ab4 SHA512 4c3e18b98b69213899a6af8366ade2ebfaa4eabef76f880cd71c300b03fc7725246200bc00491942b3f7b4b4f87bdfbc9181663fe5c8b7c5325f1e7c6e76356d
diff --git a/dev-python/pexpect/files/pexpect-4.9.0-py313.patch b/dev-python/pexpect/files/pexpect-4.9.0-py313.patch
new file mode 100644
index 000000000000..838cfdd22d86
--- /dev/null
+++ b/dev-python/pexpect/files/pexpect-4.9.0-py313.patch
@@ -0,0 +1,37 @@
+From 95d09c54d2502d8d48f2da591089ceb6d09df056 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Wed, 29 May 2024 12:21:52 +0200
+Subject: [PATCH] Force NO_COLOR=1 to fix test failures with Python 3.13+ REPL
+
+Python 3.13+ has colors now. Always setting this variable should be safe.
+---
+ pexpect/replwrap.py    | 2 +-
+ tests/test_replwrap.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pexpect/replwrap.py b/pexpect/replwrap.py
+index 08dbd5e8..c8714a23 100644
+--- a/pexpect/replwrap.py
++++ b/pexpect/replwrap.py
+@@ -35,7 +35,7 @@ def __init__(self, cmd_or_spawn, orig_prompt, prompt_change,
+                  continuation_prompt=PEXPECT_CONTINUATION_PROMPT,
+                  extra_init_cmd=None):
+         if isinstance(cmd_or_spawn, basestring):
+-            self.child = pexpect.spawn(cmd_or_spawn, echo=False, encoding='utf-8')
++            self.child = pexpect.spawn(cmd_or_spawn, echo=False, encoding='utf-8', env={'NO_COLOR': '1'})
+         else:
+             self.child = cmd_or_spawn
+         if self.child.echo:
+diff --git a/tests/test_replwrap.py b/tests/test_replwrap.py
+index ddafa5d6..5ac782a4 100644
+--- a/tests/test_replwrap.py
++++ b/tests/test_replwrap.py
+@@ -124,7 +124,7 @@ def test_no_change_prompt(self):
+         if platform.python_implementation() == 'PyPy':
+             raise unittest.SkipTest(skip_pypy)
+ 
+-        child = pexpect.spawn(sys.executable, echo=False, timeout=5, encoding='utf-8')
++        child = pexpect.spawn(sys.executable, echo=False, timeout=5, encoding='utf-8', env={'NO_COLOR': '1'})
+         # prompt_change=None should mean no prompt change
+         py = replwrap.REPLWrapper(child, u">>> ", prompt_change=None,
+                                   continuation_prompt=u"... ")
diff --git a/dev-python/pexpect/pexpect-4.9.0.ebuild b/dev-python/pexpect/pexpect-4.9.0.ebuild
index 93f20c1b16ab..a6a72d9e35dc 100644
--- a/dev-python/pexpect/pexpect-4.9.0.ebuild
+++ b/dev-python/pexpect/pexpect-4.9.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
+PYTHON_COMPAT=( python3_{10..13} python3_13t pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 pypi
@@ -29,6 +29,11 @@ distutils_enable_tests pytest
 distutils_enable_sphinx doc \
 	dev-python/sphinxcontrib-github-alt
 
+PATCHES=(
+	# https://github.com/pexpect/pexpect/pull/794
+	"${FILESDIR}/${P}-py313.patch"
+)
+
 src_test() {
 	# workaround new readline defaults
 	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
@@ -47,16 +52,6 @@ python_test() {
 		tests/test_env.py::TestCaseEnv::test_spawn_uses_env
 	)
 
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# TODO: changes in python3.13's prompt?
-				tests/test_replwrap.py::REPLWrapTestCase::test_python
-				tests/test_replwrap.py::REPLWrapTestCase::test_no_change_prompt
-			)
-			;;
-	esac
-
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	epytest
 }