[PATCH] gnu: python-ipython-documentation: Remove patches.

  • Done
  • quality assurance status badge
Details
2 participants
  • Greg Hogan
  • Ludovic Courtès
Owner
unassigned
Submitted by
Greg Hogan
Severity
normal
G
G
Greg Hogan wrote on 11 May 2023 22:36
(address . guix-patches@gnu.org)(name . Greg Hogan)(address . code@greghogan.com)
20230511203635.1019365-1-code@greghogan.com
Maxim's patch was merged and released upstream in 8.5.0:

* 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.
---
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(-)
delete mode 100644 gnu/packages/patches/python-ipython-documentation-chars.patch
delete mode 100644 gnu/packages/patches/python-ipython-documentation-repro.patch

Toggle diff (88 lines)
diff --git a/gnu/local.mk b/gnu/local.mk
index 73db48f720..6aaf155268 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1781,8 +1781,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 8887fefda8..757900c5fd 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10339,13 +10339,6 @@ (define-public python-ipython-documentation
(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
--
2.40.1
L
L
Ludovic Courtès wrote on 22 May 2023 16:49
(name . Greg Hogan)(address . code@greghogan.com)(address . 63453@debbugs.gnu.org)
878rdgxvyl.fsf@gnu.org
Hi,

Greg Hogan <code@greghogan.com> skribis:

Toggle quote (10 lines)
> Maxim's patch was merged and released upstream in 8.5.0:
> https://github.com/ipython/ipython/commit/f20e3b80393a1a5909a050cb7bb9cbce9e044827
>
> * 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.

The patch LGTM but currently ‘python-docrepr’ fails to build (test
failures) so we cannot test it.

Do you happen to have an idea how to address that?

Thanks,
Ludo’.
G
G
Greg Hogan wrote on 22 May 2023 21:37
(name . Ludovic Courtès)(address . ludo@gnu.org)(address . 63453@debbugs.gnu.org)
CA+3U0Znt6Dc9Ptn9VVrY9-EOHQsUWSwUx5GtNWQwji1Kv4CbzQ@mail.gmail.com
On Mon, May 22, 2023 at 10:49?AM Ludovic Courtès <ludo@gnu.org> wrote:
Toggle quote (23 lines)
>
> Hi,
>
> Greg Hogan <code@greghogan.com> skribis:
>
> > Maxim's patch was merged and released upstream in 8.5.0:
> > https://github.com/ipython/ipython/commit/f20e3b80393a1a5909a050cb7bb9cbce9e044827
> >
> > * 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.
>
> The patch LGTM but currently ‘python-docrepr’ fails to build (test
> failures) so we cannot test it.
>
> Do you happen to have an idea how to address that?
>
> Thanks,
> Ludo’.

Thanks for looking this over. I have a fix for python-docrepr and will
send an updated patchset after the python-ipython-documentation build
completes.
G
G
Greg Hogan wrote on 22 May 2023 22:17
[PATCH v2 1/3] gnu: python-docrepr: Fix tests.
(address . 63453@debbugs.gnu.org)(name . Greg Hogan)(address . code@greghogan.com)
2a767f5253f02d05d29a0c3107d5a8c4bd28724b.1684785831.git.code@greghogan.com
* gnu/packages/patches/python-docrepr-fix-tests.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it here.
* gnu/packages/documentation.scm (python-docrepr)[source]<patches>: Use
it here.
---
gnu/local.mk | 1 +
gnu/packages/documentation.scm | 3 ++-
.../patches/python-docrepr-fix-tests.patch | 16 ++++++++++++++++
3 files changed, 19 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/python-docrepr-fix-tests.patch

Toggle diff (50 lines)
diff --git a/gnu/local.mk b/gnu/local.mk
index c10fb01bb3..b5d43d7203 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1682,6 +1682,7 @@ dist_patch_DATA = \
%D%/packages/patches/prusa-slicer-with-cereal-1.3.1.patch \
%D%/packages/patches/pthreadpool-system-libraries.patch \
%D%/packages/patches/python-chai-drop-python2.patch \
+ %D%/packages/patches/python-docrepr-fix-tests.patch \
%D%/packages/patches/python-feedparser-missing-import.patch \
%D%/packages/patches/python-louvain-fix-test.patch \
%D%/packages/patches/python-random2-getrandbits-test.patch \
diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index bbaa01e392..be64bc4f95 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -296,7 +296,8 @@ (define-public python-docrepr
(file-name (git-file-name name version))
(sha256
(base32
- "1ma5gwy93m1djd3zdlnqfrwhgr8ic1qbsz5kkrb9f987ax40lfkd"))))
+ "1ma5gwy93m1djd3zdlnqfrwhgr8ic1qbsz5kkrb9f987ax40lfkd"))
+ (patches (search-patches "python-docrepr-fix-tests.patch"))))
(build-system python-build-system)
(arguments
(list
diff --git a/gnu/packages/patches/python-docrepr-fix-tests.patch b/gnu/packages/patches/python-docrepr-fix-tests.patch
new file mode 100644
index 0000000000..a209921025
--- /dev/null
+++ b/gnu/packages/patches/python-docrepr-fix-tests.patch
@@ -0,0 +1,16 @@
+Fixes the errors with use of asyncio in docrepr/tests/test_output.py:
+
+> await compare_screenshots(test_id, url)
+E TypeError: 'coroutine' object is not callable
+
+--- a/conftest.py
++++ b/conftest.py
+@@ -65,7 +65,7 @@ def _open_browser(url):
+
+
+ @pytest.fixture
+-async def compare_screenshots(request):
++def compare_screenshots(request):
+ """Run visual regression test on the output."""
+ async def _compare_screenshots(test_id, url):
+ if (request.config.getoption(COMPARE_SCREENSHOTS_OPTION) or
--
2.40.1
G
G
Greg Hogan wrote on 22 May 2023 22:17
[PATCH v2 3/3] gnu: python-ipython-documentation: Update dependencies.
(address . 63453@debbugs.gnu.org)(name . Greg Hogan)(address . code@greghogan.com)
d269b63cff9eed832ba37376a2d5fd77902e27d1.1684785831.git.code@greghogan.com
* gnu/packages/python-xyz.scm (python-ipython-documentation)
[native-inputs]: Add python-ipykernel.
---
gnu/packages/python-xyz.scm | 1 +
1 file changed, 1 insertion(+)

Toggle diff (14 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 162e103cbc..19d66a6399 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10477,6 +10477,7 @@ (define-public python-ipython-documentation
font-gnu-freefont
graphviz
python-docrepr
+ python-ipykernel
python-sphinx
python-sphinx-rtd-theme
texinfo
--
2.40.1
G
G
Greg Hogan wrote on 22 May 2023 22:17
[PATCH v2 2/3] gnu: python-ipython-documentation: Remove patches.
(address . 63453@debbugs.gnu.org)(name . Greg Hogan)(address . code@greghogan.com)
d2308da225df1e4ba7a28d33351b93db258b7329.1684785831.git.code@greghogan.com
* 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.
---
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(-)
delete mode 100644 gnu/packages/patches/python-ipython-documentation-chars.patch
delete mode 100644 gnu/packages/patches/python-ipython-documentation-repro.patch

Toggle diff (88 lines)
diff --git a/gnu/local.mk b/gnu/local.mk
index b5d43d7203..e0f195c0fb 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1785,8 +1785,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 1f5f937e6c..162e103cbc 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10418,13 +10418,6 @@ (define-public python-ipython-documentation
(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
--
2.40.1
G
G
Greg Hogan wrote on 22 May 2023 22:17
[PATCH v2 0/3] Fix build for python-ipython-documentation.
(address . 63453@debbugs.gnu.org)(name . Greg Hogan)(address . code@greghogan.com)
cover.1684785831.git.code@greghogan.com
Greg Hogan (3):
gnu: python-docrepr: Fix tests.
gnu: python-ipython-documentation: Remove patches.
gnu: python-ipython-documentation: Update dependencies.

gnu/local.mk | 3 +--
gnu/packages/documentation.scm | 3 ++-
.../patches/python-docrepr-fix-tests.patch | 16 ++++++++++++
.../python-ipython-documentation-chars.patch | 18 -------------
.../python-ipython-documentation-repro.patch | 25 -------------------
gnu/packages/python-xyz.scm | 8 +-----
6 files changed, 20 insertions(+), 53 deletions(-)
create mode 100644 gnu/packages/patches/python-docrepr-fix-tests.patch
delete mode 100644 gnu/packages/patches/python-ipython-documentation-chars.patch
delete mode 100644 gnu/packages/patches/python-ipython-documentation-repro.patch
L
L
Ludovic Courtès wrote on 2 Jun 2023 16:14
Re: bug#63453: [PATCH] gnu: python-ipython-documentation: Remove patches.
(name . Greg Hogan)(address . code@greghogan.com)(address . 63453-done@debbugs.gnu.org)
87353a54uk.fsf_-_@gnu.org
Greg Hogan <code@greghogan.com> skribis:

Toggle quote (4 lines)
> gnu: python-docrepr: Fix tests.
> gnu: python-ipython-documentation: Remove patches.
> gnu: python-ipython-documentation: Update dependencies.

Hi! Applied, thanks!

Ludo’.
Closed
?