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 UDbNASFtyV7PeAAA0tVLHw (envelope-from ) for ; Sat, 23 May 2020 18:36:17 +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 YJcaOSBtyV7FbwAAbx9fmQ (envelope-from ) for ; Sat, 23 May 2020 18:36:16 +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 4F5E5940365 for ; Sat, 23 May 2020 18:36:16 +0000 (UTC) Received: from localhost ([::1]:54160 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jcZ0J-0004Ez-93 for larch@yhetil.org; Sat, 23 May 2020 14:36:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcZ06-0004En-23 for guix-patches@gnu.org; Sat, 23 May 2020 14:36:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52239) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jcZ05-0002Yf-Or for guix-patches@gnu.org; Sat, 23 May 2020 14:36:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jcZ05-00083g-MO for guix-patches@gnu.org; Sat, 23 May 2020 14:36:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41395] [PATCH 1/2] gnu: python-prompt-toolkit: Update to 3.0.5 Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 May 2020 18:36:01 +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: Edouard Klein , 41395@debbugs.gnu.org Received: via spool by 41395-submit@debbugs.gnu.org id=B41395.159025895430962 (code B ref 41395); Sat, 23 May 2020 18:36:01 +0000 Received: (at 41395) by debbugs.gnu.org; 23 May 2020 18:35:54 +0000 Received: from localhost ([127.0.0.1]:35552 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcYzx-00083J-O8 for submit@debbugs.gnu.org; Sat, 23 May 2020 14:35:54 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:38219) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcYzv-000832-Ef for 41395@debbugs.gnu.org; Sat, 23 May 2020 14:35:52 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 7464E779; Sat, 23 May 2020 14:35:45 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Sat, 23 May 2020 14:35:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm3; bh=hR+NjgkboqiwFhS9gDK2IkGi7W 37CMF0Ys9BRRVrzoA=; b=IJpLcXCXp8Cd7dK5qcaK16OuxXbKolNcrq5UikN+kB si3XOWXc5dRq4z9NsbmdAnvA2KuqNf1umCa+kKst2QZzRGq2rLQxfqbqq518k+Ye 3fIwWYkKdSgRy7Kht97pNfQoP7ws6mi5FAokb8pK23T94l1lvKMEy3LD2Z7aINTc 3aPGk9YmsWXqH19m69TdL9XF+pE9hD6ciqYeQXqYefR4pN6e/++ZpwYBzhOg+GpP SpFkVWcIwxkWcBmIPftIyhQMXWtKmg58T7XkOCu6MYMTb1EmImba45gpC/WDgBhO AEb5x5Jb2Zy2HuDAc7YwzSWY4rFBLJAaYphllQLOil0g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=hR+Njg kboqiwFhS9gDK2IkGi7W37CMF0Ys9BRRVrzoA=; b=CGIg4D2N6UsIn/kB6WQfeM xnE1pw491ymUekZBHqW9OtGoZoZRK0h2li7z5kIngFJZN9r0sXb5gaupeG5t4c3n oLiuMNjzij4JtOg4h8Gz2Tpwr0euz3UGgnXFm2eya9+b7GlXe2zhRe8rAHgnK1MC BsOJ/UGMVSw7tFnnYlmKOwdyfQOsTYPvu3xHNa+0AhIxFZCBXMqaGvnge7rXM7bJ SnPzHE0w4Zryxg775dFprY/Nhj/fGMZTQM4NDXU36LBaZBASkwQlvgMwRrqnVYLv cgrFIoMtR4TWdYGd30W39mU954aE0yY3TPp7mczkClUeGkWOy6B9vL+EE/dcOFNw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrudduhedguddvjecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvffujghffgffkfggtgesghdtreertdertdenucfhrhhomhepofgrrhhi uhhsuceurghkkhgvuceomhgsrghkkhgvsehfrghsthhmrghilhdrtghomheqnecuggftrf grthhtvghrnhepjeekfeekleegveejteehleejueetudeuledvffevudefvedtvdefveei feehvedtnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepkeegrddvtddvrd eikedrjeehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhho mhepmhgsrghkkhgvsehfrghsthhmrghilhdrtghomh X-ME-Proxy: Received: from localhost (ti0006q161-2604.bb.online.no [84.202.68.75]) by mail.messagingengine.com (Postfix) with ESMTPA id 836FB3066506; Sat, 23 May 2020 14:35:44 -0400 (EDT) From: Marius Bakke In-Reply-To: <87sgfwcklx.fsf@alice.lan> References: <87v9ksckt3.fsf@alice.lan> <87sgfwcklx.fsf@alice.lan> User-Agent: Notmuch/0.29.3 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) Date: Sat, 23 May 2020 20:35:42 +0200 Message-ID: <87wo527b41.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.7 (-) 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=fastmail.com header.s=fm3 header.b=IJpLcXCX; dkim=fail (rsa verify failed) header.d=messagingengine.com header.s=fm2 header.b=CGIg4D2N; dmarc=fail reason="SPF not aligned (relaxed)" header.from=fastmail.com (policy=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: 0.49 X-TUID: 1gyXIU6JWKxf --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Edouard Klein writes: > * /gnu/packages/python-xyz.scm (python-widgetsnbextension): Pin python-pr= ompt-toolkit to version 2 > * /gnu/packages/python-xyz.scm (python-ipywidgets): Pin python-prompt-too= lkit to version 2 > * /gnu/packages/python-xyz.scm (python-jupyter-console): Pin python-promp= t-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. > @@ -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? > (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. > (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, adva= nced > +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? > +(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-toolki= t") > + (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=20 > +(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. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl7JbP4ACgkQoqBt8qM6 VPqtCgf9FOLxhEIC/DJ9PK8Au+twSwpLd8YgkVbGKmyHpv6XyQKcr++0NxExIL1G Q+s3ifB4ZdsHEjtXNy25wu2Y3Ht2gVz+rBOFJlDnh9TpvApffCOk0sqIMzJABrBj ZQMpcwNARr/XkXoZURMaek71RcZSIAWMdutrqJ+JCk/WfxxaSjB1trX/mBDR7Qdz L/vNzJhvwHgzW1JPjZfbfalmREfWVVzjB3oxUyOhhkXmsk+KBi/TrY5iKqvKoFEH JSi4vn74BDtEBa/F2mVa44u/5jzORvgahOc+CQHAijIm7EQcZOfHcBIVzBcHUQub Dawxs2EfcZ0bHFUON8Y8+OUMG2sM8Q== =qUOB -----END PGP SIGNATURE----- --=-=-=--