guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

06/17: gnu: python-ipython-documentation: Remove patches.


From: guix-commits
Subject: 06/17: gnu: python-ipython-documentation: Remove patches.
Date: Fri, 2 Jun 2023 11:24:03 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit f1af4fbeecf753a299a3cc2a441da48ee4235b48
Author: Greg Hogan <code@greghogan.com>
AuthorDate: Mon May 22 20:17:40 2023 +0000

    gnu: python-ipython-documentation: Remove patches.
    
    * gnu/packages/python-xyz.scm (python-ipython-documentation)[source]:
    Remove upstreamed patches.
    * gnu/packages/patches/python-ipython-documentation-chars.patch,
    gnu/packages/patches/python-ipython-documentation-repro.patch:
    Delete files.
    * gnu/local.mk: Remove files.
    
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/local.mk                                       |  2 --
 .../python-ipython-documentation-chars.patch       | 18 ----------------
 .../python-ipython-documentation-repro.patch       | 25 ----------------------
 gnu/packages/python-xyz.scm                        |  7 ------
 4 files changed, 52 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 6e97c3a6a6..09a4617daf 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1786,8 +1786,6 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/python-fixtures-remove-monkeypatch-test.patch   \
   %D%/packages/patches/python-hiredis-fix-header.patch         \
   %D%/packages/patches/python-hiredis-use-system-hiredis.patch \
-  %D%/packages/patches/python-ipython-documentation-chars.patch        \
-  %D%/packages/patches/python-ipython-documentation-repro.patch        \
   %D%/packages/patches/python-keras-integration-test.patch     \
   %D%/packages/patches/python-pdoc3-tests.patch                        \
   %D%/packages/patches/python-peachpy-determinism.patch        \
diff --git a/gnu/packages/patches/python-ipython-documentation-chars.patch 
b/gnu/packages/patches/python-ipython-documentation-chars.patch
deleted file mode 100644
index a52c54f513..0000000000
--- a/gnu/packages/patches/python-ipython-documentation-chars.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Avoid LaTeX errors due to non-printable characters.
-Submitted upstream: https://github.com/ipython/ipython/pull/13640
-
-diff --git a/IPython/utils/coloransi.py b/IPython/utils/coloransi.py
-index e33142180..9300b0108 100644
---- a/IPython/utils/coloransi.py
-+++ b/IPython/utils/coloransi.py
-@@ -74,8 +74,8 @@ class TermColors:
- class InputTermColors:
-     """Color escape sequences for input prompts.
- 
--    This class is similar to TermColors, but the escapes are wrapped in \001
--    and \002 so that readline can properly know the length of each line and
-+    This class is similar to TermColors, but the escapes are wrapped in \\001
-+    and \\002 so that readline can properly know the length of each line and
-     can wrap lines accordingly.  Use this class for any colored text which
-     needs to be used in input prompts, such as in calls to raw_input().
- 
diff --git a/gnu/packages/patches/python-ipython-documentation-repro.patch 
b/gnu/packages/patches/python-ipython-documentation-repro.patch
deleted file mode 100644
index d6a6e9c3fd..0000000000
--- a/gnu/packages/patches/python-ipython-documentation-repro.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Fix non-reproducibilities caused by time-dependent procedures.
-Submitted upstream: https://github.com/ipython/ipython/pull/13640
-
-diff --git a/IPython/sphinxext/ipython_directive.py 
b/IPython/sphinxext/ipython_directive.py
-index 18bdfcae9..2c665ac87 100644
---- a/IPython/sphinxext/ipython_directive.py
-+++ b/IPython/sphinxext/ipython_directive.py
-@@ -19,7 +19,7 @@
-    In [1]: 1+1
- 
-    In [1]: import datetime
--      ...: datetime.datetime.now()
-+      ...: datetime.date.fromisoformat('2022-02-22')
- 
- It supports IPython construct that plain
- Python does not understand (like magics):
-@@ -28,7 +28,7 @@
- 
-    In [0]: import time
- 
--   In [0]: %timeit time.sleep(0.05)
-+   In [0]: %pdoc time
- 
- This will also support top-level async when using IPython 7.0+
- 
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 22f8e91314..78312021d7 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10457,13 +10457,6 @@ computing.")
     (inherit python-ipython)
     (name "python-ipython-documentation")
     (version (package-version python-ipython))
-    (source
-     (origin
-       (inherit (package-source python-ipython))
-       (patches (append (search-patches
-                         "python-ipython-documentation-chars.patch"
-                         "python-ipython-documentation-repro.patch")
-                        (origin-patches (package-source python-ipython))))))
     (arguments
      (list
       #:phases



reply via email to

[Prev in Thread] Current Thread [Next in Thread]