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 EAkuDi64y16hCgAA0tVLHw (envelope-from ) for ; Mon, 25 May 2020 12:21:02 +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 KN4NCi64y15RbAAAB5/wlQ (envelope-from ) for ; Mon, 25 May 2020 12:21:02 +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 8BC3794036C for ; Mon, 25 May 2020 12:21:01 +0000 (UTC) Received: from localhost ([::1]:59096 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jdC6F-0000hZ-2V for larch@yhetil.org; Mon, 25 May 2020 08:20:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jdBbL-0004et-3i for guix-patches@gnu.org; Mon, 25 May 2020 07:49:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56760) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jdBbK-0004vN-QY for guix-patches@gnu.org; Mon, 25 May 2020 07:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jdBbK-0005nY-PC for guix-patches@gnu.org; Mon, 25 May 2020 07:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41395] [PATCH 1/2] gnu: python-prompt-toolkit: Update to 3.0.5 Resent-From: Edouard Klein Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 May 2020 11:49: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.159040728222201 (code B ref 41395); Mon, 25 May 2020 11:49:02 +0000 Received: (at 41395) by debbugs.gnu.org; 25 May 2020 11:48:02 +0000 Received: from localhost ([127.0.0.1]:40067 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jdBaL-0005lk-Mt for submit@debbugs.gnu.org; Mon, 25 May 2020 07:48:02 -0400 Received: from sender4-op-o11.zoho.com ([136.143.188.11]:17197) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jdAj9-00008D-Rb for 41395@debbugs.gnu.org; Mon, 25 May 2020 06:53:04 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1590403982; cv=none; d=zohomail.com; s=zohoarc; b=DVBo9/pK3/gdJ78jo3LTlEiDSEL0P/s5Am9hjotZly3XFTr0fP2LAknT4QHqlQOmPh/SC4l7vowFe3LU68bSzgoLmY4xC35oQU1ROMpzvmfoDLDwU0zzBFsYHQH6YQYyLlfMfS5OQhs+Mdj8tK9D2UWrNJW92g5V9cAnHQII36U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590403982; h=Content-Type:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=+MYk8oyl+1aPB3RYMaqwz3snWtP5wCpTvzn2lf3cnDg=; b=WlGBcFuWhCFA0umiP/yZ0VO/qxjwLXer3E3eot62ZOOKnDUdOYOKjR20OlE51haJxHF13gW8mh5bGZp3B6Oncb0r6cxFX9aR8cvR4Ke9+vZQuSLhDl8iYTnqG8t/ox75Lud3v3pmF+HFYx9LThlxoGnUVY1qDAtTmVG+82CeXAk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=rdklein.fr; spf=pass smtp.mailfrom=edou@rdklein.fr; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1590403982; s=zoho; d=rdklein.fr; i=edou@rdklein.fr; h=References:From:To:Subject:In-reply-to:Message-ID:Date:MIME-Version:Content-Type; bh=+MYk8oyl+1aPB3RYMaqwz3snWtP5wCpTvzn2lf3cnDg=; b=TbZW8vvIwT70JiBiozZzVVmXtU0VvlLBNdAO4LYkHV5v5oM8O9rhhufL+mzsC/v1 4WD4VFsfo8qIttDnvrM/OVZO+PEPuj8fMNLszpJ+ClFSlkueKJY8wz4Wt+IiLsZbH1f KsjJKbtzLTSGPcPNDJ7OB60APWf2bklgYlVuDTXo= 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 1590403978793333.5812699116425; Mon, 25 May 2020 03:52:58 -0700 (PDT) References: <87v9ksckt3.fsf@alice.lan> <87sgfwcklx.fsf@alice.lan> <87wo527b41.fsf@devup.no> User-agent: mu4e 1.4.6; emacs 26.3 From: Edouard Klein In-reply-to: <87wo527b41.fsf@devup.no> Message-ID: <87pnasi8w7.fsf@alice.lan> Date: Mon, 25 May 2020 12:52:40 +0200 MIME-Version: 1.0 Content-Type: text/plain X-ZohoMailClient: External X-Spam-Score: 0.0 (/) X-Mailman-Approved-At: Mon, 25 May 2020 07:48:00 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-Mailman-Approved-At: Mon, 25 May 2020 08:20:55 -0400 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=rdklein.fr header.s=zoho header.b=TbZW8vvI; 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: +dytXi08jcuu Thank you for your comments :) Marius Bakke writes: > Edouard Klein writes: > >> * /gnu/packages/python-xyz.scm (python-widgetsnbextension): Pin python-prompt-toolkit to version 2 >> * /gnu/packages/python-xyz.scm (python-ipywidgets): Pin python-prompt-toolkit 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-toolkit): New variable >> * /gnu/packages/machine-learning.scm (python-iml): Pin ipython to python-prompt-toolkit-2 variant > > You only need to mention the file name once. OK :) > >> @@ -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") > > Can you submit the home page and inputs change of this package as two > separate patches? > Done >> (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)) > > It would be great to update these packages instead of pinning to the old > version. I won't blame you if you don't feel like embarking on that > journey though. > In the new patches I'm about to send, I updated them. Alas even their latest versions still require python-prompt-toolkit <=2.1, so I had to pin the dependencies. I did it in a cleaner way, though. >> (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))) > > Can you make python-prompt-toolkit-2 inherit from this package to avoid > duplicating the entire expression? > Done >> +(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)) >> >> +(define-public prompt-toolkit-2-instead-of-prompt-toolkit >> + (package-input-rewriting/spec >> + `(("python-prompt-toolkit" . ,(const python-prompt-toolkit-2))))) > > Is this actually necessary? Just changing the inputs as you did above > should be sufficient I think. If one dependency is OK with python-prompt-toolkit in version 3, but a package has an implicit dependency on python-prompt-toolkit in version 2, then we either have to pin them all to version 2, and the OK dependency does not get to envoy the update, or we have to resort to this. I did it because python-ipython (19 dependents) is OK with the update, and I did not want to pin it (and all its dependents) to python-prompt-toolkit-2. This is my first time making such an involved update, so I'm open to suggestions as to alternative ways of doing this.