From patchwork Fri Jun 5 23:07:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giacomo Leidi X-Patchwork-Id: 22561 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8E7DB27BBE3; Sat, 6 Jun 2020 00:08:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, T_DKIM_INVALID,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id B8F1B27BBE1 for ; Sat, 6 Jun 2020 00:08:24 +0100 (BST) Received: from localhost ([::1]:51932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhLRo-0000YS-3U for patchwork@mira.cbaines.net; Fri, 05 Jun 2020 19:08:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33344) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhLRT-0000XH-4b for guix-patches@gnu.org; Fri, 05 Jun 2020 19:08:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38650) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jhLRS-0002kt-Rn for guix-patches@gnu.org; Fri, 05 Jun 2020 19:08:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jhLRS-0001EA-MJ for guix-patches@gnu.org; Fri, 05 Jun 2020 19:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41730] [PATCH] gnu: Fix propagations of python-prompt-toolkit-2. Resent-From: goodoldpaul@autistici.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 Jun 2020 23:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 41730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41730@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15913984424636 (code B ref -1); Fri, 05 Jun 2020 23:08:02 +0000 Received: (at submit) by debbugs.gnu.org; 5 Jun 2020 23:07:22 +0000 Received: from localhost ([127.0.0.1]:50182 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhLQo-0001Ch-7G for submit@debbugs.gnu.org; Fri, 05 Jun 2020 19:07:22 -0400 Received: from lists.gnu.org ([209.51.188.17]:54186) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhLQm-0001Ca-Hb for submit@debbugs.gnu.org; Fri, 05 Jun 2020 19:07:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33260) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhLQm-0000RV-D0 for guix-patches@gnu.org; Fri, 05 Jun 2020 19:07:20 -0400 Received: from devianza.investici.org ([198.167.222.108]:61205) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhLQk-0002fs-Pf for guix-patches@gnu.org; Fri, 05 Jun 2020 19:07:20 -0400 Received: from 1.mail-backend.investici.org (unknown [10.0.0.11]) by devianza.investici.org (Postfix) with ESMTP id DAA47E05A4 for ; Fri, 5 Jun 2020 23:07:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1591398426; bh=2qFflP/QtiwHG+tCHZDfEdcLI4oA+Gj1zbfG30KXVDM=; h=Date:From:To:Subject:From; b=Vc3kdyU7SQzuHMoAShvuR55rnmhho2y30tdUkXuqA3xaSTGNq63w0IfOw6D6y4fvu hgK6EMrh4EeVC+mGrZ+rHJKpFpff5lbJfpkQ5Pbe1EwNEL/gocN+NMl4rGc8wS8kQp dZuliR79bI1HD1h46qPdksaXMe1SM5wMDcqz7la0= Received: from 1.webmail.investici.org (localhost [127.0.0.1]) (Authenticated sender: goodoldpaul@autistici.org) by 1.mail-backend.investici.org (Postfix) with ESMTPA id C4BAABEE54 for ; Fri, 5 Jun 2020 23:07:06 +0000 (UTC) MIME-Version: 1.0 Date: Fri, 05 Jun 2020 23:07:06 +0000 From: goodoldpaul@autistici.org User-Agent: Roundcube Webmail Message-ID: <74e587be32830618a856a6f2fc29b4ad@autistici.org> X-Sender: goodoldpaul@autistici.org Received-SPF: pass client-ip=198.167.222.108; envelope-from=goodoldpaul@autistici.org; helo=devianza.investici.org X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/05 18:44:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hello Guix! On Guix System guix ecab53c repository URL: https://git.savannah.gnu.org/git/guix.git branch: master commit: ecab53c320b1584a08f811b17a92bd9a50a50ff3 it's impossible to install jupyter in a new profile because it tries to propagate two different versions of python-ipython, you should be able to reproduce with: guix package -p /tmp/tmp-prof -i jupyter I believe since 32ba87c14fd5e5b54d95211cd9a159d568ce7c67 many packages whose tests depend on version python-prompt-toolkit at version 2 yield conflicts when installed in a profile. I attached a patch to propagate the right versions. Giacomo From 052d6b9b72a914a15cf01f83e7c73439fac44c16 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Sat, 6 Jun 2020 00:30:08 +0200 Subject: [PATCH] gnu: Fix propagations of python-prompt-toolkit-2. Since the update of python-prompt-toolkit to 3.0.5 many packages whose tests depend on version 2 yield conflicts when installed in a profile. * gnu/packages/python-xyz.scm (python-ipywidgets)[propagated-inputs]: Add python-ipython, move python-ipython-with-prompt-toolkit-2 from here... [native-inputs]: ...to here; (python-jupyter-console)[propagated-inputs]: Add python-ipykernel and python-prompt-toolkit, move python-ipykernel-with-prompt-toolkit-2 from here... [native-inputs]: ...to here and add python-prompt-toolkit-2; (python-widgetsnbextension)[propagated-inputs]: Add python-ipykernel, move python-ipykernel-with-prompt-toolkit-2 from here... [native-inputs]: ...to here. --- gnu/packages/python-xyz.scm | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2e9f0d5632..72a25a6aef 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9016,11 +9016,13 @@ interactive computing.") "1ismyaxbv9d56yqqqb8xl58hg0iq0bbyy014a53y1g3hfbc8g7q7")))) (build-system python-build-system) (propagated-inputs - `(("python-ipykernel" - ,(prompt-toolkit-2-instead-of-prompt-toolkit python-ipykernel)) + `(("python-ipykernel" ,python-ipykernel) ("python-notebook" ,python-notebook))) (native-inputs - `(("python-certifi" ,python-certifi) + ;; FIXME: ipykernel is here to prevent profile conflicts. + `(("python-ipykernel-with-prompt-2" + ,(prompt-toolkit-2-instead-of-prompt-toolkit python-ipykernel)) + ("python-certifi" ,python-certifi) ("python-nose" ,python-nose))) (home-page "https://ipython.org") (synopsis "IPython HTML widgets for Jupyter") @@ -9044,12 +9046,15 @@ notebooks.") "15sww2mvnkqlvx55gwa82v05062a8j1xpncnqna4k9sl53hgcig9")))) (build-system python-build-system) (propagated-inputs - `(("python-ipython" ,(prompt-toolkit-2-instead-of-prompt-toolkit - python-ipython)) + `(("python-ipython" ,python-ipython) ("python-traitlets" ,python-traitlets) ("python-widgetsnbextension" ,python-widgetsnbextension))) (native-inputs - `(("python-nose" ,python-nose) + ;; FIXME: ipython is here to prevent profile conflicts. + `(("python-ipython-with-prompt-2" + ,(prompt-toolkit-2-instead-of-prompt-toolkit + python-ipython)) + ("python-nose" ,python-nose) ("python-pytest" ,python-pytest))) (home-page "https://ipython.org") (synopsis "IPython HTML widgets for Jupyter") @@ -9075,13 +9080,17 @@ in the data.") "06s3kr5vx0l1y1b7fxb04dmrppscl7q69sl9yyfr0d057d1ssvkg")))) (build-system python-build-system) (propagated-inputs - `(("python-ipykernel" ,(prompt-toolkit-2-instead-of-prompt-toolkit - python-ipykernel)) + `(("python-ipykernel" ,python-ipykernel) ("python-jupyter-client" ,python-jupyter-client) - ("python-prompt-toolkit" ,python-prompt-toolkit-2) + ("python-prompt-toolkit" ,python-prompt-toolkit) ("python-pygments" ,python-pygments))) (native-inputs - `(("python-nose" ,python-nose))) + ;; FIXME: ipykernel is here to prevent profile conflicts. + `(("python-ipykernel-with-prompt-2" + ,(prompt-toolkit-2-instead-of-prompt-toolkit + python-ipykernel)) + ("python-prompt-toolkit-2" ,python-prompt-toolkit-2) + ("python-nose" ,python-nose))) (home-page "https://jupyter.org") (synopsis "Jupyter terminal console") (description "This package provides a terminal-based console frontend for -- 2.26.2