From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id K/GyIa6J6F5RZwAA0tVLHw (envelope-from ) for ; Tue, 16 Jun 2020 08:58:22 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id sKdOHa6J6F5sWQAAbx9fmQ (envelope-from ) for ; Tue, 16 Jun 2020 08:58:22 +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 DE4C094036C for ; Tue, 16 Jun 2020 08:58:21 +0000 (UTC) Received: from localhost ([::1]:55774 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jl7QB-0006S1-Eu for larch@yhetil.org; Tue, 16 Jun 2020 04:58:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jl7Pu-0006Qk-8E for guix-patches@gnu.org; Tue, 16 Jun 2020 04:58:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36687) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jl7Pt-00024P-Sw for guix-patches@gnu.org; Tue, 16 Jun 2020 04:58:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jl7Pt-0000JX-Pf for guix-patches@gnu.org; Tue, 16 Jun 2020 04:58:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41889] [PATCH] gnu: jupyter: Fix python-ipython conflict that prevented installation Resent-From: Edouard Klein Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Jun 2020 08:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 41889 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41889@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15922978651183 (code B ref -1); Tue, 16 Jun 2020 08:58:01 +0000 Received: (at submit) by debbugs.gnu.org; 16 Jun 2020 08:57:45 +0000 Received: from localhost ([127.0.0.1]:48233 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jl7Pc-0000J0-L5 for submit@debbugs.gnu.org; Tue, 16 Jun 2020 04:57:45 -0400 Received: from lists.gnu.org ([209.51.188.17]:57450) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jl7Pa-0000It-Oh for submit@debbugs.gnu.org; Tue, 16 Jun 2020 04:57:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jl7Pa-00069e-GU for guix-patches@gnu.org; Tue, 16 Jun 2020 04:57:42 -0400 Received: from sender4-op-o11.zoho.com ([136.143.188.11]:17166) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jl7PX-000226-P4 for guix-patches@gnu.org; Tue, 16 Jun 2020 04:57:42 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1592297854; cv=none; d=zohomail.com; s=zohoarc; b=jUZIyucu6eCm+ZBed9AT7IcY2563hP1KJ1vIcek3SeyLnPwr1Kaxjdo1bHSrQFpGkQNtLUCuJ9PV/1dHiAX+uLgvUzdLSeRFmZG+Y2Gpf98XQPfXUrC8boTIHcAEg6xCv/aa8xvAK7/AbEDG3f1Xpzfm9gm7rLsGun2l6JT7bII= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592297854; h=Content-Type:Date:From:MIME-Version:Message-ID:Subject:To; bh=xJX8optLuRpSHAkYdlRPUxBJsSBjnJDO9QUez28W0lY=; b=hAJtJMs20odB9SB56vxmy6ZiCXP0HD3sv84AzrXp8cja6tnsfpWUuZv47PGWI170PlWCfU3tblUxa1BxU7Rtq2M7c9nuc0eROlWQNc3i5QrVjtjLujXPL6i5Cvy2c7CRYBpgOP6RijeSh/td1JiwTHSvzggQsClQHqNcEDuAt4M= 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=1592297854; s=zoho; d=beaver-labs.com; i=edk@beaver-labs.com; h=From:To:Subject:Message-ID:Date:MIME-Version:Content-Type; bh=xJX8optLuRpSHAkYdlRPUxBJsSBjnJDO9QUez28W0lY=; b=FhhVbrNVjlND/qmH5Ie0lbCp07vxOIniot4+QkYRn3qkhkY94hIbcJ+koNBwrob9 3XozZFFUN11QjvlVWZ1SKeob88R0GIaaxru4vFlq0vSlWu160N/IrOQtyDjS62Q3vOD lt6WQmBR0r+RL3TCYyN+K9ALKosKCM0wlWIloZEc= 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 1592297852278338.4799159392187; Tue, 16 Jun 2020 01:57:32 -0700 (PDT) User-agent: mu4e 1.4.6; emacs 26.3 From: Edouard Klein Message-ID: <87o8pj9ymu.fsf@alice.lan> Date: Tue, 16 Jun 2020 10:57:13 +0200 MIME-Version: 1.0 Content-Type: text/plain X-ZohoMailClient: External Received-SPF: pass client-ip=136.143.188.11; envelope-from=edk@beaver-labs.com; helo=sender4-op-o11.zoho.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/16 04:57:36 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -2.4 (--) 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=FhhVbrNV; 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: Pg31yU/XBrKC * gnu/packages/python-xyz.scm (python-prompt-toolkit, python-prompt-toolkit-2) (prompt-toolkit-2-instead-of-prompt-toolkit, python2-prompt-toolkit) (python-prompt-toolkit-1): Move up so that packages defined below can see them. (python-widgetsnbextension): Wrap in prompt-toolkit-2-instead-of-prompt-toolkit to satisfy an explicit dependency on python-prompt-toolkit-2. (python-ipywidgets): Likewise. (python-jupyter-console): Likewise. (jupyter): Likewise. * gnu/packages/package-management.scm (guix-jupyter): Wrap some dependencies in prompt-toolkit-2-instead-of-prompt-toolkit to make the reverse bag graphs of python-prompt-toolkit-2 and python-prompt-toolkit-3 disconnected graphs. * gnu/packages/machine-learning.scm (python-iml): Wrap in prompt-toolkit-2-instead-of-prompt-toolkit to satisfy an explicit dependency on python-prompt-toolkit-2. --- gnu/packages/machine-learning.scm | 46 ++-- gnu/packages/package-management.scm | 4 +- gnu/packages/python-xyz.scm | 345 ++++++++++++++-------------- 3 files changed, 198 insertions(+), 197 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 0e11da41ca..51bf2ad779 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1805,33 +1805,33 @@ advanced research.") (license license:asl2.0))) (define-public python-iml - (package - (name "python-iml") - (version "0.6.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "iml" version)) - (sha256 - (base32 - "1k8szlpm19rcwcxdny9qdm3gmaqq8akb4xlvrzyz8c2d679aak6l")))) - (build-system python-build-system) - (propagated-inputs - `(("ipython" ,(prompt-toolkit-2-instead-of-prompt-toolkit - python-ipython)) - ("numpy" ,python-numpy) - ("pandas" ,python-pandas) - ("scipy" ,python-scipy))) - (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, + (prompt-toolkit-2-instead-of-prompt-toolkit + (package + (name "python-iml") + (version "0.6.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "iml" version)) + (sha256 + (base32 + "1k8szlpm19rcwcxdny9qdm3gmaqq8akb4xlvrzyz8c2d679aak6l")))) + (build-system python-build-system) + (propagated-inputs + `(("ipython" ,python-ipython) + ("numpy" ,python-numpy) + ("pandas" ,python-pandas) + ("scipy" ,python-scipy))) + (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 explain the predictions of machine learning models (or really the output of any function). It currently contains the interface and IO code from the Shap project, and it will potentially also do the same for the Lime project.") - (license license:expat))) + (license license:expat)))) (define-public python-keras-applications (package diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index c1e6657dff..c282ecab40 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -976,8 +976,8 @@ environments.") ;; For testing. ("jupyter" ,jupyter) - ("python-ipython" ,python-ipython) - ("python-ipykernel" ,python-ipykernel))) + ("python-ipython" ,(prompt-toolkit-2-instead-of-prompt-toolkit python-ipython)) + ("python-ipykernel" ,(prompt-toolkit-2-instead-of-prompt-toolkit python-ipykernel)))) (inputs `(("guix" ,guix) ("guile" ,guile-3.0))) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7e0a738d51..ebe21a3754 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8872,6 +8872,81 @@ functions to find and load entry points.") from elisp.") (license license:gpl3))) +(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, advanced +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 (inherit python-prompt-toolkit) + (name "python-prompt-toolkit") + (version "2.0.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "prompt_toolkit" version)) + (sha256 + (base32 + "0fgacqk73w7s932vy46pan2yp8rvjmlkag20xvaydh9mhf6h85zx")))) + (propagated-inputs + `(("python-wcwidth" ,python-wcwidth) + ("python-six" ,python-six) + ("python-pygments" ,python-pygments))))) + +(define-public prompt-toolkit-2-instead-of-prompt-toolkit + (package-input-rewriting/spec + `(("python-prompt-toolkit" . ,(const python-prompt-toolkit-2))))) + +(define-public python2-prompt-toolkit + (package-with-python2 python-prompt-toolkit-2)) + +(define-public python-prompt-toolkit-1 + (package (inherit python-prompt-toolkit-2) + (version "1.0.15") + (source + (origin + (method url-fetch) + (uri (pypi-uri "prompt_toolkit" version ".tar.gz")) + (sha256 + (base32 + "05v9h5nydljwpj5nm8n804ms0glajwfy1zagrzqrg91wk3qqi1c5")))))) + +(define-public python2-prompt-toolkit-1 + (package-with-python2 python-prompt-toolkit-1)) + (define-public python-nbconvert (package (name "python-nbconvert") @@ -8992,91 +9067,91 @@ interactive computing.") (("formats = self.nbconvert_api") "return #"))))))))))) (define-public python-widgetsnbextension - (package - (name "python-widgetsnbextension") - (version "3.5.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "widgetsnbextension" version)) - (sha256 - (base32 - "1ismyaxbv9d56yqqqb8xl58hg0iq0bbyy014a53y1g3hfbc8g7q7")))) - (build-system python-build-system) - (propagated-inputs - `(("python-ipykernel" - ,(prompt-toolkit-2-instead-of-prompt-toolkit python-ipykernel)) - ("python-notebook" ,python-notebook))) - (native-inputs - `(("python-certifi" ,python-certifi) - ("python-nose" ,python-nose))) - (home-page "https://ipython.org") - (synopsis "IPython HTML widgets for Jupyter") - (description "This package provides interactive HTML widgets for Jupyter + (prompt-toolkit-2-instead-of-prompt-toolkit + (package + (name "python-widgetsnbextension") + (version "3.5.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "widgetsnbextension" version)) + (sha256 + (base32 + "1ismyaxbv9d56yqqqb8xl58hg0iq0bbyy014a53y1g3hfbc8g7q7")))) + (build-system python-build-system) + (propagated-inputs + `(("python-ipykernel" ,python-ipykernel) + ("python-notebook" ,python-notebook))) + (native-inputs + `(("python-certifi" ,python-certifi) + ("python-nose" ,python-nose))) + (home-page "https://ipython.org") + (synopsis "IPython HTML widgets for Jupyter") + (description "This package provides interactive HTML widgets for Jupyter notebooks.") - (license license:bsd-3))) + (license license:bsd-3)))) (define-public python2-widgetsnbextension (package-with-python2 python-widgetsnbextension)) (define-public python-ipywidgets - (package - (name "python-ipywidgets") - (version "7.5.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "ipywidgets" version)) - (sha256 - (base32 - "15sww2mvnkqlvx55gwa82v05062a8j1xpncnqna4k9sl53hgcig9")))) - (build-system python-build-system) - (propagated-inputs - `(("python-ipython" ,(prompt-toolkit-2-instead-of-prompt-toolkit - python-ipython)) - ("python-traitlets" ,python-traitlets) - ("python-widgetsnbextension" ,python-widgetsnbextension))) - (native-inputs - `(("python-nose" ,python-nose) - ("python-pytest" ,python-pytest))) - (home-page "https://ipython.org") - (synopsis "IPython HTML widgets for Jupyter") - (description "Ipywidgets are interactive HTML widgets for Jupyter + (prompt-toolkit-2-instead-of-prompt-toolkit + (package + (name "python-ipywidgets") + (version "7.5.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ipywidgets" version)) + (sha256 + (base32 + "15sww2mvnkqlvx55gwa82v05062a8j1xpncnqna4k9sl53hgcig9")))) + (build-system python-build-system) + (propagated-inputs + `(("python-ipython" ,python-ipython) + ("python-traitlets" ,python-traitlets) + ("python-widgetsnbextension" ,python-widgetsnbextension))) + (native-inputs + `(("python-nose" ,python-nose) + ("python-pytest" ,python-pytest))) + (home-page "https://ipython.org") + (synopsis "IPython HTML widgets for Jupyter") + (description "Ipywidgets are interactive HTML widgets for Jupyter notebooks and the IPython kernel. Notebooks come alive when interactive widgets are used. Users gain control of their data and can visualize changes in the data.") - (license license:bsd-3))) + (license license:bsd-3)))) (define-public python2-ipywidgets (package-with-python2 python-ipywidgets)) (define-public python-jupyter-console - (package - (name "python-jupyter-console") - (version "6.1.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "jupyter_console" version)) - (sha256 - (base32 - "06s3kr5vx0l1y1b7fxb04dmrppscl7q69sl9yyfr0d057d1ssvkg")))) - (build-system python-build-system) - (propagated-inputs - `(("python-ipykernel" ,(prompt-toolkit-2-instead-of-prompt-toolkit - python-ipykernel)) - ("python-jupyter-client" ,python-jupyter-client) - ("python-prompt-toolkit" ,python-prompt-toolkit-2) - ("python-pygments" ,python-pygments))) - (native-inputs - `(("python-nose" ,python-nose))) - (home-page "https://jupyter.org") - (synopsis "Jupyter terminal console") - (description "This package provides a terminal-based console frontend for + (prompt-toolkit-2-instead-of-prompt-toolkit + (package + (name "python-jupyter-console") + (version "6.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "jupyter_console" version)) + (sha256 + (base32 + "06s3kr5vx0l1y1b7fxb04dmrppscl7q69sl9yyfr0d057d1ssvkg")))) + (build-system python-build-system) + (propagated-inputs + `(("python-ipykernel" ,python-ipykernel) + ("python-jupyter-client" ,python-jupyter-client) + ("python-prompt-toolkit" ,python-prompt-toolkit) + ("python-pygments" ,python-pygments))) + (native-inputs + `(("python-nose" ,python-nose))) + (home-page "https://jupyter.org") + (synopsis "Jupyter terminal console") + (description "This package provides a terminal-based console frontend for Jupyter kernels. It also allows for console-based interaction with non-Python Jupyter kernels such as IJulia and IRKernel.") - (properties `((python2-variant . ,(delay python2-jupyter-console)))) - (license license:bsd-3))) + (properties `((python2-variant . ,(delay python2-jupyter-console)))) + (license license:bsd-3)))) (define-public python2-jupyter-console (package @@ -9209,37 +9284,38 @@ popular online obfuscators.") (license license:expat))) (define-public jupyter - (package - (name "jupyter") - (version "1.0.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "jupyter" version)) - (sha256 - (base32 - "0pwf3pminkzyzgx5kcplvvbvwrrzd3baa7lmh96f647k30rlpp6r")))) - (build-system python-build-system) - (arguments '(#:tests? #f)) ; there are none. - (propagated-inputs - `(("python-ipykernel" ,python-ipykernel) - ("python-ipywidgets" ,python-ipywidgets) - ("python-jupyter-console" ,python-jupyter-console) - ("python-nbconvert" ,python-nbconvert) - ("python-notebook" ,python-notebook) - ("python-qtconsole" ,python-qtconsole))) - (native-search-paths - (list (search-path-specification - (variable "JUPYTER_PATH") - (files '("share/jupyter"))))) - (home-page "https://jupyter.org") - (synopsis "Web application for interactive documents") - (description - "The Jupyter Notebook is a web application that allows you to create and + (prompt-toolkit-2-instead-of-prompt-toolkit + (package + (name "jupyter") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "jupyter" version)) + (sha256 + (base32 + "0pwf3pminkzyzgx5kcplvvbvwrrzd3baa7lmh96f647k30rlpp6r")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; there are none. + (propagated-inputs + `(("python-ipykernel" ,python-ipykernel) + ("python-ipywidgets" ,python-ipywidgets) + ("python-jupyter-console" ,python-jupyter-console) + ("python-nbconvert" ,python-nbconvert) + ("python-notebook" ,python-notebook) + ("python-qtconsole" ,python-qtconsole))) + (native-search-paths + (list (search-path-specification + (variable "JUPYTER_PATH") + (files '("share/jupyter"))))) + (home-page "https://jupyter.org") + (synopsis "Web application for interactive documents") + (description + "The Jupyter Notebook is a web application that allows you to create and share documents that contain live code, equations, visualizations and explanatory text. Uses include: data cleaning and transformation, numerical simulation, statistical modeling, machine learning and much more.") - (license license:bsd-3))) + (license license:bsd-3)))) (define-public python-chardet (package @@ -12138,81 +12214,6 @@ collections of data.") (define-public python2-backpack (package-with-python2 python-backpack)) -(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, advanced -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 (inherit python-prompt-toolkit) - (name "python-prompt-toolkit") - (version "2.0.7") - (source - (origin - (method url-fetch) - (uri (pypi-uri "prompt_toolkit" version)) - (sha256 - (base32 - "0fgacqk73w7s932vy46pan2yp8rvjmlkag20xvaydh9mhf6h85zx")))) - (propagated-inputs - `(("python-wcwidth" ,python-wcwidth) - ("python-six" ,python-six) - ("python-pygments" ,python-pygments))))) - -(define-public prompt-toolkit-2-instead-of-prompt-toolkit - (package-input-rewriting/spec - `(("python-prompt-toolkit" . ,(const python-prompt-toolkit-2))))) - -(define-public python2-prompt-toolkit - (package-with-python2 python-prompt-toolkit-2)) - -(define-public python-prompt-toolkit-1 - (package (inherit python-prompt-toolkit-2) - (version "1.0.15") - (source - (origin - (method url-fetch) - (uri (pypi-uri "prompt_toolkit" version ".tar.gz")) - (sha256 - (base32 - "05v9h5nydljwpj5nm8n804ms0glajwfy1zagrzqrg91wk3qqi1c5")))))) - -(define-public python2-prompt-toolkit-1 - (package-with-python2 python-prompt-toolkit-1)) - (define-public python-jedi (package (name "python-jedi") -- 2.26.2