From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id IMG+Leutw16OZgAA0tVLHw (envelope-from ) for ; Tue, 19 May 2020 09:59:07 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id gBmcKeutw17jHAAAB5/wlQ (envelope-from ) for ; Tue, 19 May 2020 09:59:07 +0000 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 4376894017B for ; Tue, 19 May 2020 09:59:07 +0000 (UTC) Received: from localhost ([::1]:55702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaz1e-0004Ra-8h for larch@yhetil.org; Tue, 19 May 2020 05:59:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaz1a-0004RU-KT for guix-patches@gnu.org; Tue, 19 May 2020 05:59:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37725) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaz1a-0004sb-C8 for guix-patches@gnu.org; Tue, 19 May 2020 05:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaz1a-0007iv-BQ for guix-patches@gnu.org; Tue, 19 May 2020 05:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41395] [PATCH 1/2] gnu: python-prompt-toolkit: Update to 3.0.5 References: <87v9ksckt3.fsf@alice.lan> In-Reply-To: <87v9ksckt3.fsf@alice.lan> Resent-From: Edouard Klein Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 May 2020 09:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41395 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41395@debbugs.gnu.org Received: via spool by 41395-submit@debbugs.gnu.org id=B41395.158988229229629 (code B ref 41395); Tue, 19 May 2020 09:59:02 +0000 Received: (at 41395) by debbugs.gnu.org; 19 May 2020 09:58:12 +0000 Received: from localhost ([127.0.0.1]:49271 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaz0m-0007hp-BU for submit@debbugs.gnu.org; Tue, 19 May 2020 05:58:12 -0400 Received: from sender4-op-o11.zoho.com ([136.143.188.11]:17179) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaz0k-0007hg-2Y for 41395@debbugs.gnu.org; Tue, 19 May 2020 05:58:10 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1589882287; cv=none; d=zohomail.com; s=zohoarc; b=UXp3IKKM5SMq1qSKL4oX4dl9ObRMr17LO+l1K9iBbmqM57YCXJUsws5Zn0jTwLszZCTWSlqm72dgm/XaZW3G/he6y3X2EqrladsJiDWlb2fkoGS6hFSNCwFQogSncL+1f3AZ4BN6F/keV/eF1vDle+1z9K296CbX7eRuyhxrDGs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589882287; h=Content-Type:Content-Transfer-Encoding:Date:From:MIME-Version:Message-ID:Subject:To; bh=mWQ0CTykVXJVF7ikKPjEEYj0oKJzp8RwUEWNadJk3sM=; b=mSTWJ3+hyX1aqXhao8yTRSWn/1/qcEbJ9IhgYxgq2gzJzPGUZwd4yTy/Sf4wKBwuBhD9zgr6oR2xtGeM5FvosL7X9RsbhxsTOhP5erR+kW1mcy3/ZAj7lWuUIlnG+05GklohCkIstI2cvYpwwuVpIAQ5F6l/h2ZrgHPdnZnm88M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=beaver-labs.com; spf=pass smtp.mailfrom=edk@beaver-labs.com; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1589882287; s=zoho; d=beaver-labs.com; i=edk@beaver-labs.com; h=From:To:Subject:Message-ID:Date:MIME-Version:Content-Type:Content-Transfer-Encoding; bh=mWQ0CTykVXJVF7ikKPjEEYj0oKJzp8RwUEWNadJk3sM=; b=YFIjqks5eLopWpRgVAvnKQn0tGxJd7T/sKP9DbLJt5sMO2bGEA7fqv1v7B6+DVUY ubMye1r6TUadSvsO4xFY6D93wTcvgG/VhZKyKREe4ivZcV4pYOgXe3DrV71rNEYKG7b GPEX4Z9ngUStNTb4gDNu1O7ohPAYRce6u4d91hw4= Received: from alice.lan (lfbn-idf1-1-1299-119.w90-79.abo.wanadoo.fr [90.79.23.119]) by mx.zohomail.com with SMTPS id 158988228626875.40940067723591; Tue, 19 May 2020 02:58:06 -0700 (PDT) User-agent: mu4e 1.4.4; emacs 26.3 From: Edouard Klein Message-ID: <87sgfwcklx.fsf@alice.lan> Date: Tue, 19 May 2020 11:58:02 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) 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-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=beaver-labs.com header.s=zoho header.b=YFIjqks5; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 1.99 X-TUID: DJwjJ39gSOmZ * /gnu/packages/python-xyz.scm (python-widgetsnbextension): Pin python-prom= pt-toolkit to version 2 * /gnu/packages/python-xyz.scm (python-ipywidgets): Pin python-prompt-toolk= it to version 2 * /gnu/packages/python-xyz.scm (python-jupyter-console): Pin python-prompt-= toolkit to version 2 * /gnu/packages/python-xyz.scm (python-prompt-toolkit): Update to 3.0.5 * /gnu/packages/python-xyz.scm (python-prompt-toolkit-2): New variable * /gnu/packages/python-xyz.scm (python-prompt-toolkit-2-instead-of-prompt-t= oolkit): New variable * /gnu/packages/machine-learning.scm (python-iml): Pin ipython to python-pr= ompt-toolkit-2 variant --- gnu/packages/machine-learning.scm | 9 ++++-- gnu/packages/python-xyz.scm | 48 +++++++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 5 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learn= ing.scm index 6552d171bf..5553b31bb5 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -14,6 +14,7 @@ ;;; Copyright =C2=A9 2019 Guillaume Le Vaillant ;;; Copyright =C2=A9 2019 Brett Gilio ;;; Copyright =C2=A9 2020 Konrad Hinsen +;;; Copyright =C2=A9 2020 Edouard Klein ;;; ;;; This file is part of GNU Guix. ;;; @@ -1803,12 +1804,14 @@ advanced research.") "1k8szlpm19rcwcxdny9qdm3gmaqq8akb4xlvrzyz8c2d679aak6l")))) (build-system python-build-system) (propagated-inputs - `(("ipython" ,python-ipython) - ("nose" ,python-nose) + `(("ipython" ,(prompt-toolkit-2-instead-of-prompt-toolkit + python-ipython)) ("numpy" ,python-numpy) ("pandas" ,python-pandas) ("scipy" ,python-scipy))) - (home-page "http://github.com/interpretable-ml/iml") + (native-inputs + `(("nose" ,python-nose))) + (home-page "https://github.com/interpretable-ml/iml") (synopsis "Interpretable Machine Learning (iML) package") (description "Interpretable ML (iML) is a set of data type objects, visualizations, and interfaces that can be used by any method designed to diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b8a51570c3..5fd7e274e9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8922,6 +8922,7 @@ interactive computing.") (build-system python-build-system) (propagated-inputs `(("python-ipykernel" ,python-ipykernel) + ("python-prompt-toolkit" ,python-prompt-toolkit-2) ("python-notebook" ,python-notebook))) (native-inputs `(("python-certifi" ,python-certifi) @@ -8950,6 +8951,7 @@ notebooks.") (propagated-inputs `(("python-ipython" ,python-ipython) ("python-traitlets" ,python-traitlets) + ("python-prompt-toolkit" ,python-prompt-toolkit-2) ("python-widgetsnbextension" ,python-widgetsnbextension))) (native-inputs `(("python-nose" ,python-nose) @@ -8980,7 +8982,7 @@ in the data.") (propagated-inputs `(("python-ipykernel" ,python-ipykernel) ("python-jupyter-client" ,python-jupyter-client) - ("python-prompt-toolkit" ,python-prompt-toolkit) + ("python-prompt-toolkit" ,python-prompt-toolkit-2) ("python-pygments" ,python-pygments))) (native-inputs `(("python-nose" ,python-nose))) @@ -12049,6 +12051,44 @@ collections of data.") (package-with-python2 python-backpack)) =20 (define-public python-prompt-toolkit + (package + (name "python-prompt-toolkit") + (version "3.0.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "prompt_toolkit" version)) + (sha256 + (base32 + "1j3x5s4gp4ih73sbcni0a0vffbzvrxbrbnkvb3fzjgxn810ilgan")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'check) + (add-after 'install 'post-install-check + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; HOME is needed for the test + ;; "test_pathcompleter_can_expanduser". + (setenv "HOME" "/tmp") + (add-installed-pythonpath inputs outputs) + (invoke "py.test")))))) + (propagated-inputs + `(("python-wcwidth" ,python-wcwidth))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page + "https://github.com/prompt-toolkit/python-prompt-toolkit") + (synopsis "Library for building command line interfaces in Python") + (description + "Prompt-Toolkit is a library for building interactive command line +interfaces in Python. It's like GNU Readline but it also features syntax +highlighting while typing, out-of-the-box multi-line input editing, advanc= ed +code completion, incremental search, support for Chinese double-width +characters, mouse support, and auto suggestions.") + (license license:bsd-3))) + +(define-public python-prompt-toolkit-2 (package (name "python-prompt-toolkit") (version "2.0.7") @@ -12077,7 +12117,7 @@ collections of data.") ("python-pygments" ,python-pygments))) (native-inputs `(("python-pytest" ,python-pytest))) - (home-page "https://github.com/jonathanslenders/python-prompt-toolkit") + (home-page "https://github.com/prompt-toolkit/python-prompt-toolkit") (synopsis "Library for building command line interfaces in Python") (description "Prompt-Toolkit is a library for building interactive command line @@ -12104,6 +12144,10 @@ characters, mouse support, and auto suggestions.") (define-public python2-prompt-toolkit-1 (package-with-python2 python-prompt-toolkit-1)) =20 +(define-public prompt-toolkit-2-instead-of-prompt-toolkit + (package-input-rewriting/spec + `(("python-prompt-toolkit" . ,(const python-prompt-toolkit-2))))) + (define-public python-jedi (package (name "python-jedi") --=20 2.26.2