From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id oIWXKf4fZmKSewEAbAwnHQ (envelope-from ) for ; Mon, 25 Apr 2022 06:13:50 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id yFx6Kf4fZmJBQQEAauVa8A (envelope-from ) for ; Mon, 25 Apr 2022 06:13:50 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 458D629DD1 for ; Mon, 25 Apr 2022 06:13:50 +0200 (CEST) Received: from localhost ([::1]:58812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1niq6f-00088z-Da for larch@yhetil.org; Mon, 25 Apr 2022 00:13:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38248) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1niptm-0007gQ-UX for guix-patches@gnu.org; Mon, 25 Apr 2022 00:00:38 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38519) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nipte-0001Hn-T1 for guix-patches@gnu.org; Mon, 25 Apr 2022 00:00:30 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nipte-0007pB-QT for guix-patches@gnu.org; Mon, 25 Apr 2022 00:00:22 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55104] [PATCH 010/232] gnu: python-ipython: Update to 8.2.0 [fixes CVE-2022-21699]. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Apr 2022 04:00:22 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55104 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55104@debbugs.gnu.org Cc: Maxim Cournoyer , Leo Famulari Received: via spool by 55104-submit@debbugs.gnu.org id=B55104.165085921930037 (code B ref 55104); Mon, 25 Apr 2022 04:00:22 +0000 Received: (at 55104) by debbugs.gnu.org; 25 Apr 2022 04:00:19 +0000 Received: from localhost ([127.0.0.1]:60623 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1niptR-0007mK-SZ for submit@debbugs.gnu.org; Mon, 25 Apr 2022 00:00:18 -0400 Received: from mail-qk1-f181.google.com ([209.85.222.181]:37613) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1niptB-0007h4-RW for 55104@debbugs.gnu.org; Sun, 24 Apr 2022 23:59:54 -0400 Received: by mail-qk1-f181.google.com with SMTP id b68so9974012qkc.4 for <55104@debbugs.gnu.org>; Sun, 24 Apr 2022 20:59:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vYW5ODScfig2SPnRxMAvJjsrL2RADwHvxefPAYnlHQo=; b=iuAmq0+GV3ZZeAISB9u8R21CG8Mhs6roZgUZ7AVQINJXBEsbJ5VLOdYo6cuPwJZOcP n4c3UhITXDkNjeLgUX2rD3XLwsG2v816kBbczP6vepxfFpcI3AnYfx2k1qEyiKOQgGn4 Y81LwvoPZHzyypFUqTLeuf6Y1b7+sL3c+S0R4BiKd4HhMwtbBQJmuRPtmrjpPeCJKxce RKHK6ughg9ZLu/XAo8r5WYGwF75C8yM4AyUZZZgOX6weOlrETH2fNdc7/77CaTj4GPWG IDtC2c10WEyUF051RmMJBH9ogNvCMasZC3Ful3DZRlZsRCdbP7azaQe6u69OmyPVfTNX 1f8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vYW5ODScfig2SPnRxMAvJjsrL2RADwHvxefPAYnlHQo=; b=3hHWX6DGIjovnmY/gDchBLYnv9HarH5502jMWLmQiVE3H8u5mYWAh+Ns7FoNvlTg1d Ux3Ij8sI9UsUWamPwou0Odwty0z1BOtaDGQ4S2qWzUmIRuM4zS9nFQTezuPjhe7KhLBN KFeyi4+G4OeMVCIqCZ+UDSVfC8uDW0yy/LSW1+9Wqaiz5x2fAabKKLfGb3zJVqXQdIra Y26kdhO+BsrWM48RuyBb2GsAhtop+p6L6mcvfeE7MrRR2bSR69LOH9VQ3PXfA7W03K9i X3/mtMwZBdOVXEzpy7loT43Q3YlzMauOex/54U/Vl5/2AsCdyecuMGi4V7c9PfR5IXby WNhw== X-Gm-Message-State: AOAM530YPhtZqgIkQcUaConUqs6VxXsboDLi4iYsCVT72kS+oAwExOe3 xQ9bzeXqO5G+9v/z/KHRPEPs2mJEUSTsZg== X-Google-Smtp-Source: ABdhPJxtvJbuiiFH1OxjDckSDJbo/yoNiS+qwwZJeczbXG4xrbIHF1mZbLWUobukXuoZwXdCD5U5Nw== X-Received: by 2002:a05:620a:1431:b0:69e:59be:1ece with SMTP id k17-20020a05620a143100b0069e59be1ecemr8984393qkj.600.1650859188092; Sun, 24 Apr 2022 20:59:48 -0700 (PDT) Received: from localhost.localdomain (dsl-150-232.b2b2c.ca. [66.158.150.232]) by smtp.gmail.com with ESMTPSA id w82-20020a376255000000b0069ee3f0ae63sm4478142qkb.45.2022.04.24.20.59.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Apr 2022 20:59:47 -0700 (PDT) From: Maxim Cournoyer Date: Sun, 24 Apr 2022 23:55:36 -0400 Message-Id: <20220425035918.25683-10-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220425035918.25683-1-maxim.cournoyer@gmail.com> References: <20220425035918.25683-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1650860030; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=vYW5ODScfig2SPnRxMAvJjsrL2RADwHvxefPAYnlHQo=; b=btkXeyH6LkPpW2GnXSsAs4yJD7Fth+G8yReVcjVwkznXm1AFz0buNerEJb19OEqgFfw9TA oJX8Z3LPTB5YkHMK7SK/hQW3lbm4H9XUIckTKJeVGsviIhsPoVyrZEQHsfvPA4A2nLEvM1 xro8EsXoOSFd0HOz6jdHBBI48qJoTdYXGcSfzfd8QyB4kGClZNDdXzFf1VIx8NKsMmbh26 j4uAoB6OBsgDYqowCey9FOsFTqrcGCC72qJwkGWpDhm1O28hxCY8xSvXnDCKZL1lvrAywn h2+G3oSFoLEjrkYf9Dk+VK0ds9il3JozEvy2OMukogYm+yQHWW70wcL7xmDfsQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1650860030; a=rsa-sha256; cv=none; b=OmdGRLhFwqIVTB08ZN2Bz5khHFykA7PnyCeSQIyTFW0aeWvRUkdbG9tN0TVoP13w4t8p5/ a6ZqOXbO1QtMQNPUZzgkCNTrwIsT7fcCVONrng2w7d5sQQCZGMFAheJkhmD+TZkakvjS5E EZi3EAN/fSzbsQCxB0vaQr6tVdI2L+qE9OF1db/0ow2ObHSzJtorHkdAB6WtwWw6VjNLtM w/S9Gl0SNHBnYZImm/65xFJfQbEkIpfOBLZSBFTx+3c4xrZJFJZi3ByFMiOoJPVKQuS4AC 3K45YqQVn10X+l/EWhvFZe6e5+xIncCI7IkNMV05KEbwpMoDM3FfViv9UV0jLQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=iuAmq0+G; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 7.99 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=iuAmq0+G; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 458D629DD1 X-Spam-Score: 7.99 X-Migadu-Scanner: scn1.migadu.com X-TUID: +/3MLxdUKT/R * gnu/packages/python-xyz.scm (python-ipython): Update to 8.2.0. [phases]{fix-tests}: Delete phase. {check}: Remove extraneous add-installed-pythonpath call. Invoke Pytest directly. Reported-by: Leo Famulari --- gnu/packages/python-xyz.scm | 45 ++++++++++++------------------------- 1 file changed, 14 insertions(+), 31 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8d46d992b0..44011944d9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9059,13 +9059,13 @@ (define-public python-stack-data (define-public python-ipython (package (name "python-ipython") - (version "7.27.0") + (version "8.2.0") (source (origin (method url-fetch) (uri (pypi-uri "ipython" version ".tar.gz")) (sha256 - (base32 "04xgymypnbfgf2q0d5b0hanjbjsp53f055sh1p8xlq52vyzmxdaq")))) + (base32 "1hcxa713wh3axa57412iy02rj0494ljvv6gpnls4lndc5h9yprbh")))) (build-system python-build-system) (arguments `(#:phases @@ -9076,34 +9076,15 @@ (define-public python-ipython ((".*import datetime") "") ((".*datetime.datetime.now\\(\\)") "") (("%timeit") "# %timeit")))) - (add-before 'check 'fix-tests - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "./IPython/utils/_process_posix.py" - (("/usr/bin/env', 'which") (which "which"))) - (substitute* "./IPython/core/tests/test_inputtransformer.py" - (("#!/usr/bin/env python") - (string-append "#!" (which "python")))) - ;; This test introduces a circular dependency on ipykernel - ;; (which depends on ipython). - (delete-file "IPython/core/tests/test_display.py") - ;; AttributeError: module 'IPython.core' has no attribute 'formatters' - (delete-file "IPython/core/tests/test_interactiveshell.py") - ;; AttributeError: module 'matplotlib_inline' has no - ;; attribute 'backend_inline' - (delete-file "IPython/core/tests/test_pylabtools.py"))) (replace 'check (lambda* (#:key inputs outputs tests? #:allow-other-keys) (when tests? - ;; Make installed package available for running the tests - (add-installed-pythonpath inputs outputs) - (setenv "HOME" "/tmp/") ;; required by a test - ;; We only test the core because one of the other tests - ;; tries to import ipykernel. - (invoke "python" "IPython/testing/iptest.py" - "-v" "IPython/core/tests"))))))) + (setenv "HOME" "/tmp/") ;required by some tests + (invoke "python" "-m" "pytest" "-vv"))))))) (inputs (list readline which)) (propagated-inputs (list python-backcall + python-decorator python-jedi python-jinja2 python-jsonschema @@ -9115,18 +9096,20 @@ (define-public python-ipython python-numpydoc python-pexpect python-pickleshare - python-prompt-toolkit-2 + python-prompt-toolkit python-pygments python-pyzmq python-simplegeneric + python-stack-data python-terminado python-traitlets)) (native-inputs (list graphviz pkg-config - python-requests ;for tests - python-testpath - python-nose)) + ;; For tests. + python-pytest + python-requests + python-testpath)) (home-page "https://ipython.org") (synopsis "IPython is a tool for interactive computing in Python") (description @@ -9173,14 +9156,14 @@ (define-public python-ipython-documentation (mkdir-p info) ;; (copy-file "docs/build/texinfo/ipython.info" ;; (string-append info "/ipython.info")) - (copy-file "COPYING.rst" (string-append doc "/COPYING.rst"))) - #t))))) + (copy-file "COPYING.rst" (string-append doc "/COPYING.rst")))))))) (inputs (list python-ipython python-ipykernel)) (native-inputs `(("python-sphinx" ,python-sphinx) ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme) - ;; FIXME: It's possible that a smaller union would work just as well. + ;; FIXME: It's possible that a smaller updmap.cfg would work just as + ;; well. ("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts texlive-capt-of texlive-fonts-ec -- 2.34.0