Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] python3-prompt_toolkit: update to 3.0.43.
@ 2023-12-13 17:25 tornaria
  2023-12-13 20:39 ` [PR PATCH] [Merged]: " ahesford
  0 siblings, 1 reply; 2+ messages in thread
From: tornaria @ 2023-12-13 17:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 630 bytes --]

There is a new pull request by tornaria against master on the void-packages repository

https://github.com/tornaria/void-packages prompt_toolkit
https://github.com/void-linux/void-packages/pull/47738

python3-prompt_toolkit: update to 3.0.43.
#### Testing the changes
- I tested the changes in this PR: **YES**

This includes fixes for the two issues we had patches for:
 - disable a workaround not needed in ipython 8.18
 - restore SIGINT os-level handler so it's compatible with cysignals (used a lot in sagemath)

Cc: @ahesford 

A patch file from https://github.com/void-linux/void-packages/pull/47738.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prompt_toolkit-47738.patch --]
[-- Type: text/x-diff, Size: 6088 bytes --]

From 0cded2de6036e10e037ae3240fcb2c40f72f700e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 12 Dec 2023 12:31:24 -0300
Subject: [PATCH] python3-prompt_toolkit: update to 3.0.43.

---
 ...-disable_workaround_for_ipython_8.18.patch | 23 ------
 .../patches/dont-handle-sigint.patch          | 70 -------------------
 srcpkgs/python3-prompt_toolkit/template       |  6 +-
 3 files changed, 3 insertions(+), 96 deletions(-)
 delete mode 100644 srcpkgs/python3-prompt_toolkit/patches/1821-disable_workaround_for_ipython_8.18.patch
 delete mode 100644 srcpkgs/python3-prompt_toolkit/patches/dont-handle-sigint.patch

diff --git a/srcpkgs/python3-prompt_toolkit/patches/1821-disable_workaround_for_ipython_8.18.patch b/srcpkgs/python3-prompt_toolkit/patches/1821-disable_workaround_for_ipython_8.18.patch
deleted file mode 100644
index ac752dc75b83c..0000000000000
--- a/srcpkgs/python3-prompt_toolkit/patches/1821-disable_workaround_for_ipython_8.18.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 55a45b1d19330a939d5df5a33671c10d52e11477 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
-Date: Mon, 27 Nov 2023 11:10:21 -0300
-Subject: [PATCH] Disable workaround for ipython >= 8.18
-
----
- src/prompt_toolkit/application/application.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/prompt_toolkit/application/application.py b/src/prompt_toolkit/application/application.py
-index 726fc0a06..c07ea4e94 100644
---- a/src/prompt_toolkit/application/application.py
-+++ b/src/prompt_toolkit/application/application.py
-@@ -960,7 +960,8 @@ def run_in_thread() -> None:
-         def _called_from_ipython() -> bool:
-             try:
-                 return (
--                    "IPython/terminal/interactiveshell.py"
-+                    sys.modules["IPython"].version_info < (8, 18, 0, "")
-+                    and "IPython/terminal/interactiveshell.py"
-                     in sys._getframe(3).f_code.co_filename
-                 )
-             except BaseException:
diff --git a/srcpkgs/python3-prompt_toolkit/patches/dont-handle-sigint.patch b/srcpkgs/python3-prompt_toolkit/patches/dont-handle-sigint.patch
deleted file mode 100644
index 4bcca9d169215..0000000000000
--- a/srcpkgs/python3-prompt_toolkit/patches/dont-handle-sigint.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-This makes handle_sigint default to False
-
-See:
- - https://github.com/void-linux/void-packages/issues/35712
- - https://github.com/prompt-toolkit/python-prompt-toolkit/issues/1576
- - https://trac.sagemath.org/ticket/33360#comment:3
-
-diff -ur a/src/prompt_toolkit/application/application.py b/src/prompt_toolkit/application/application.py
---- a/src/prompt_toolkit/application/application.py
-+++ b/src/prompt_toolkit/application/application.py
-@@ -633,7 +633,7 @@
-         self,
-         pre_run: Optional[Callable[[], None]] = None,
-         set_exception_handler: bool = True,
--        handle_sigint: bool = True,
-+        handle_sigint: bool = False,
-         slow_callback_duration: float = 0.5,
-     ) -> _AppResult:
-         """
-@@ -858,7 +858,7 @@
-         self,
-         pre_run: Optional[Callable[[], None]] = None,
-         set_exception_handler: bool = True,
--        handle_sigint: bool = True,
-+        handle_sigint: bool = False,
-         in_thread: bool = False,
-     ) -> _AppResult:
-         """
-diff -ur a/src/prompt_toolkit/application/dummy.py b/src/prompt_toolkit/application/dummy.py
---- a/src/prompt_toolkit/application/dummy.py
-+++ b/src/prompt_toolkit/application/dummy.py
-@@ -24,7 +24,7 @@
-         self,
-         pre_run: Optional[Callable[[], None]] = None,
-         set_exception_handler: bool = True,
--        handle_sigint: bool = True,
-+        handle_sigint: bool = False,
-         in_thread: bool = False,
-     ) -> None:
-         raise NotImplementedError("A DummyApplication is not supposed to run.")
-@@ -33,7 +33,7 @@
-         self,
-         pre_run: Optional[Callable[[], None]] = None,
-         set_exception_handler: bool = True,
--        handle_sigint: bool = True,
-+        handle_sigint: bool = False,
-         slow_callback_duration: float = 0.5,
-     ) -> None:
-         raise NotImplementedError("A DummyApplication is not supposed to run.")
-diff -ur a/src/prompt_toolkit/shortcuts/prompt.py b/src/prompt_toolkit/shortcuts/prompt.py
---- a/src/prompt_toolkit/shortcuts/prompt.py
-+++ b/src/prompt_toolkit/shortcuts/prompt.py
-@@ -900,7 +900,7 @@
-         accept_default: bool = False,
-         pre_run: Optional[Callable[[], None]] = None,
-         set_exception_handler: bool = True,
--        handle_sigint: bool = True,
-+        handle_sigint: bool = False,
-         in_thread: bool = False,
-     ) -> _T:
-         """
-@@ -1135,7 +1135,7 @@
-         accept_default: bool = False,
-         pre_run: Optional[Callable[[], None]] = None,
-         set_exception_handler: bool = True,
--        handle_sigint: bool = True,
-+        handle_sigint: bool = False,
-     ) -> _T:
- 
-         if message is not None:
diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template
index 6e60d8daa6c6f..3f2ac98dd8e49 100644
--- a/srcpkgs/python3-prompt_toolkit/template
+++ b/srcpkgs/python3-prompt_toolkit/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-prompt_toolkit'
 pkgname=python3-prompt_toolkit
-version=3.0.41
-revision=2
+version=3.0.43
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-wcwidth"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
 changelog="https://raw.githubusercontent.com/prompt-toolkit/python-prompt-toolkit/master/CHANGELOG"
 distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=941367d97fc815548822aa26c2a269fdc4eb21e9ec05fc5d447cf09bad5d75f0
+checksum=3527b7af26106cbc65a040bcc84839a3566ec1b051bb0bfe953631e704b0ff7d
 conflicts="python3-prompt_toolkit2<=2.0.9_4"
 
 post_install() {

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: python3-prompt_toolkit: update to 3.0.43.
  2023-12-13 17:25 [PR PATCH] python3-prompt_toolkit: update to 3.0.43 tornaria
@ 2023-12-13 20:39 ` ahesford
  0 siblings, 0 replies; 2+ messages in thread
From: ahesford @ 2023-12-13 20:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 470 bytes --]

There's a merged pull request on the void-packages repository

python3-prompt_toolkit: update to 3.0.43.
https://github.com/void-linux/void-packages/pull/47738

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

This includes fixes for the two issues we had patches for:
 - disable a workaround not needed in ipython 8.18
 - restore SIGINT os-level handler so it's compatible with cysignals (used a lot in sagemath)

Cc: @ahesford 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-12-13 20:39 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-13 17:25 [PR PATCH] python3-prompt_toolkit: update to 3.0.43 tornaria
2023-12-13 20:39 ` [PR PATCH] [Merged]: " ahesford

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).