From patchwork Mon May 22 20:17:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 50240 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 524FB27BBE9; Mon, 22 May 2023 21:18:30 +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 C51A527BBE2 for ; Mon, 22 May 2023 21:18:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1Byp-0002Rv-Sb; Mon, 22 May 2023 16:18:07 -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 1q1Byl-0002Qd-MP for guix-patches@gnu.org; Mon, 22 May 2023 16:18:04 -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 1q1Byl-0003DO-Ej for guix-patches@gnu.org; Mon, 22 May 2023 16:18:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q1Byl-0007ej-AO for guix-patches@gnu.org; Mon, 22 May 2023 16:18:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63453] [PATCH v2 2/3] gnu: python-ipython-documentation: Remove patches. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 May 2023 20:18:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63453 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63453@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 63453-submit@debbugs.gnu.org id=B63453.168478667929399 (code B ref 63453); Mon, 22 May 2023 20:18:03 +0000 Received: (at 63453) by debbugs.gnu.org; 22 May 2023 20:17:59 +0000 Received: from localhost ([127.0.0.1]:36865 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1Byh-0007e0-2r for submit@debbugs.gnu.org; Mon, 22 May 2023 16:17:59 -0400 Received: from mail-yw1-f170.google.com ([209.85.128.170]:44339) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1Byb-0007dI-4g for 63453@debbugs.gnu.org; Mon, 22 May 2023 16:17:56 -0400 Received: by mail-yw1-f170.google.com with SMTP id 00721157ae682-565014fc2faso18263347b3.1 for <63453@debbugs.gnu.org>; Mon, 22 May 2023 13:17:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20221208.gappssmtp.com; s=20221208; t=1684786667; x=1687378667; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+F4WDLLt/+XB9RiZbOZXQeyjuLwnix9qeWrgC/IaUfk=; b=OVaprNUjHNWbohj0EPETr4Pr1R4/L43fmP+tuB5a1EWbm4r0bKExfczXVucVCWgpQ5 BuwaLfweuijYiFJq+obcb2mBrFmvB3DKvRs2ZIt6ZFjnwXLzQwQsKIkFx0dpgB7dDAMs BLmZ+nKbvYNGVdCcxM1hERAfqmjuBcb0hqY2MgCKuCCDBveG7GGmlH/pVOwwQ6zFsII1 Y6LqLxjbH7xVSzyQDCbdNrsrO+58ovQaXLNH35b8glYTIvJU1ys1DJre8rvJK1/nkTwc AcFYkE25TNleFW/IyUz4iXhsYHSrKe2BrHeIytOfiUk3xU/iTKxixHzwOb4T3uP39hYj znDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684786667; x=1687378667; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+F4WDLLt/+XB9RiZbOZXQeyjuLwnix9qeWrgC/IaUfk=; b=RlnwD05o2+6mvH13StzF+Rn1ZwJ/4HVpce5LBLN4S0+w0b0cRmeDxNW4C5XtjJZXqJ VJdnu+km3gFpdHEkfw0Hjw7oaXBYJ11iCfotFylgRYFMFMZ8wJEXUxNz5B8E5XLqdeWs Suz3rSZsN8GdPYkjtqNVUQGjoZFH3OGYA4XarCuoFQHEGUwaRZ9OPMmCrJsiFRrHIqWI heid0ime81tPDCjT9IGeALfKwIiOSgV1fDfseRCSDp0C3jvPJmI2NkyOoOX/7ESLIwFX /l6kIoi9rWykJIL+pBJ27GhyKI/ZCIstQy/9GEXAZXGqPu/VPBssbs4Xtlfxx8Fl+Cen 00mA== X-Gm-Message-State: AC+VfDwSjejjqc9SYFtsYxspIpZd/Lmo8dqqmqNaAqs6+zbc+RJRhyDt C4tNHOXAhCo5u7e+0AlKX2OKbTlCXOakU5CJFybLrw== X-Google-Smtp-Source: ACHHUZ7th25gjJY9Is1MutWUbKHxoUhehSN0iru7DqMbyCRILHcWGtX+XRmr6oFZq8DTlPirNNLXXw== X-Received: by 2002:a0d:d6c8:0:b0:54f:b6af:ac15 with SMTP id y191-20020a0dd6c8000000b0054fb6afac15mr14214088ywd.51.1684786667565; Mon, 22 May 2023 13:17:47 -0700 (PDT) Received: from ip-172-31-16-142.us-east-2.compute.internal (ec2-18-118-111-177.us-east-2.compute.amazonaws.com. [18.118.111.177]) by smtp.gmail.com with ESMTPSA id a11-20020a81bb4b000000b0054e82b6a95esm2311785ywl.42.2023.05.22.13.17.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 13:17:47 -0700 (PDT) From: Greg Hogan Date: Mon, 22 May 2023 20:17:40 +0000 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 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 * 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 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