From patchwork Thu May 11 20:36:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 49951 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B947827BBF0; Thu, 11 May 2023 21:37:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9532827BBEE for ; Thu, 11 May 2023 21:37:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxD2A-0001w6-DJ; Thu, 11 May 2023 16:37:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pxD27-0001vi-KV for guix-patches@gnu.org; Thu, 11 May 2023 16:37:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pxD27-0001sB-B0 for guix-patches@gnu.org; Thu, 11 May 2023 16:37:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pxD25-0004kX-Vc for guix-patches@gnu.org; Thu, 11 May 2023 16:37:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63453] [PATCH] gnu: python-ipython-documentation: Remove patches. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 May 2023 20:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63453 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63453@debbugs.gnu.org Cc: Greg Hogan X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168383740418231 (code B ref -1); Thu, 11 May 2023 20:37:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 May 2023 20:36:44 +0000 Received: from localhost ([127.0.0.1]:53512 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxD1o-0004jy-3i for submit@debbugs.gnu.org; Thu, 11 May 2023 16:36:44 -0400 Received: from lists.gnu.org ([209.51.188.17]:60794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxD1m-0004jr-Ey for submit@debbugs.gnu.org; Thu, 11 May 2023 16:36:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pxD1m-0001tN-7D for guix-patches@gnu.org; Thu, 11 May 2023 16:36:42 -0400 Received: from mail-yw1-x112b.google.com ([2607:f8b0:4864:20::112b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pxD1j-0001lk-Nu for guix-patches@gnu.org; Thu, 11 May 2023 16:36:41 -0400 Received: by mail-yw1-x112b.google.com with SMTP id 00721157ae682-55a83e80262so135267607b3.3 for ; Thu, 11 May 2023 13:36:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20221208.gappssmtp.com; s=20221208; t=1683837398; x=1686429398; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=z6+vDzYubQUn1rcKPrdLSKve7EnzYjT9HU62MxQVv1c=; b=AVwiu0dK6v+svEUng/xahZpu1ALmSnsWfqt0+R/lfIJeyay8OPNrt2OfwxN1jyhD9I ZIjdhPAy33A/jGtc/SWVRANdNmFeI9fnlQ31yszUWNIlGDi04/VwCEzZQo9wNQPTFCkH NOwbxTZp9BRp2J9u7WTiB1MRcpVJHncXifDBcbc7JfowDpw5SkO8JgKjfLWUZhw6LGKc chZhfZX2NdCc0Za2Z5GLeLvPjUrC5WnXpuYzsoDJq3AwoyOOk5tV79kurmbg3cfNrdbQ Hg9AF3HeFSgxxS6/+stoflH6WMnO2GXskxQcEqQfIo/mpCWkFKISWyaV9jqtqJgQYjdg zRdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683837398; x=1686429398; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=z6+vDzYubQUn1rcKPrdLSKve7EnzYjT9HU62MxQVv1c=; b=S/dwC18NDlsHcrE9m2xrcY1Or1QNFrdkkP6pcfx/ktkrKT/McDoa+6neZG1rCAZUmp b0KnIbdJAxUfn/pz9fubSvNprTgFsENi4C5NZR2Xz6YnZzG6aKYVtf0bLqSYmp80eb1/ EL8bXroheioHDDdE4C22Evuxw3dFwDvqnAloduXsmRY3BGa8T1YgacCHWQKiY/tVHH+X esTJfsaNhRjkXmO2Oei4Qh88lPi1m1k+7i7aDVyx+OnylY76+Vbk/PfSXYWydp+Fau6h ukiUO/FNE5HrBS4M6U3xxfsjS8Sa8VbC9DxtRPGMaAebSI0vVjrZGTxAUOY9Xn9ZnZeV Lq/A== X-Gm-Message-State: AC+VfDxGGxmIwlg0A000+tO+sYiOZIgCQvTfSuXECKzS+zMIhPECu38r L0B1WHiHUKfKwkTsRo0azeI2MB51cMIg6CeB+czIxQ== X-Google-Smtp-Source: ACHHUZ7pavgRiZT3q4DeoRZsgEaTVjqT4RivDMxG+KwuteDqNtj94AzoNl6qmVnBhV7nhAsecoC7pw== X-Received: by 2002:a81:8104:0:b0:55d:7d07:7fbb with SMTP id r4-20020a818104000000b0055d7d077fbbmr24000557ywf.27.1683837398428; Thu, 11 May 2023 13:36:38 -0700 (PDT) Received: from ip-172-31-16-142.us-east-2.compute.internal (ec2-18-117-196-55.us-east-2.compute.amazonaws.com. [18.117.196.55]) by smtp.gmail.com with ESMTPSA id l65-20020a0dfb44000000b005461671a79csm2333920ywf.138.2023.05.11.13.36.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 May 2023 13:36:38 -0700 (PDT) From: Greg Hogan Date: Thu, 11 May 2023 20:36:35 +0000 Message-Id: <20230511203635.1019365-1-code@greghogan.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::112b; envelope-from=code@greghogan.com; helo=mail-yw1-x112b.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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. --- 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 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