From patchwork Mon Apr 25 03:57:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 38880 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 C24EB27BBEA; Mon, 25 Apr 2022 05:25:50 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 417CE27BBE9 for ; Mon, 25 Apr 2022 05:25:50 +0100 (BST) Received: from localhost ([::1]:51348 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1niqIH-00067f-Dz for patchwork@mira.cbaines.net; Mon, 25 Apr 2022 00:25:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38982) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nipwF-0008Cx-To for guix-patches@gnu.org; Mon, 25 Apr 2022 00:03:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38845) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nipwF-0001sd-In for guix-patches@gnu.org; Mon, 25 Apr 2022 00:03:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nipwF-0008KB-Fp for guix-patches@gnu.org; Mon, 25 Apr 2022 00:03:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55104] [PATCH 101/232] gnu: Add python-ipyparallel-bootstrap. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Apr 2022 04:03:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55104 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55104@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 55104-submit@debbugs.gnu.org id=B55104.165085935731931 (code B ref 55104); Mon, 25 Apr 2022 04:03:03 +0000 Received: (at 55104) by debbugs.gnu.org; 25 Apr 2022 04:02:37 +0000 Received: from localhost ([127.0.0.1]:60970 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nipvo-0008Ir-Lm for submit@debbugs.gnu.org; Mon, 25 Apr 2022 00:02:37 -0400 Received: from mail-qk1-f171.google.com ([209.85.222.171]:39811) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nipuI-0007vh-Fu for 55104@debbugs.gnu.org; Mon, 25 Apr 2022 00:01:04 -0400 Received: by mail-qk1-f171.google.com with SMTP id q75so9969383qke.6 for <55104@debbugs.gnu.org>; Sun, 24 Apr 2022 21:01:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vlX47+GUyLPQ568KIbKpg8K4Tscko8a+ChGr1hECmQw=; b=SnTLnFUB6j1r6t9RcqiolTu2SW9KL+3dx2J330JMlA+WJPwfXhylWgidaexfV9gaua cklE3jZmssei8cbKnPd5kTkhz+sD2h4aE5Qk22T7jPyqoaqX4ZrENt5ihhM4yekAbJfu GlNd7l8Y/71FgbvcPKEaz3Ouzs+hF1rvxF9tgwfGGwNFDCnecEdpivN6N/88iKWklb0U Vr339jsq4fKkNGA2cTDt6cjZuERpx4IqdbEp1rzpiXRCppzBxkI4GNnB5OSCK3A6bZct yP6hDd5KpIqONBIYbdObfRgjKM4nyVUnQaLVRepFnX59xr9bBNKpJRGtAzP4sZ5xzo3u s2iA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vlX47+GUyLPQ568KIbKpg8K4Tscko8a+ChGr1hECmQw=; b=v7Qtj/mCl2Kot03NwMLGk4O7Mgolt/BC4mO4bc5zV18X02NenhUiOuHfDde6PtG7J8 ZxwfMtLk1Z8V1trdZjSzv1/93JtxZKG1UmysAr+vwVaBZ+g2YOL0KKkHulHuXO3PMHJT WqJHJ/1TfqYuiTJPoV5lVd8yZ9Ww9LM8EkV8UWuAsEL03Z86oR0raFQGLvz0JnJtPJoA 5gQYAx82AOXuVXcEKtEJyNMa1In0/atkBbMaQjnTJf5837YlmZwgYTYynGVrk9spx+DM WtX3CtftxHhG97cXsNj3EFaKp9hsicJSHl7M0bgNgDtOsW6bU8achfDdFC0DOiYF3Z1p Dk6A== X-Gm-Message-State: AOAM533n7lZOlcYgDJ8MWj/La9MCthztsmeb1qnToPKq3QUSwEbkyR+/ fvtGb13IMMAMbFIgs2G4yRXFJ4YJ1zkquA== X-Google-Smtp-Source: ABdhPJzz1/9DtQxQPHtCsaJeSseeVvbkw6YLx9oC0TPVUx6IOdWlKp2uHEM8KYESvoGQ1y630m+SnA== X-Received: by 2002:a05:620a:4045:b0:69e:c0e9:46ae with SMTP id i5-20020a05620a404500b0069ec0e946aemr9058149qko.205.1650859256868; Sun, 24 Apr 2022 21:00:56 -0700 (PDT) Received: from localhost.localdomain (dsl-150-232.b2b2c.ca. [66.158.150.232]) by smtp.gmail.com with ESMTPSA id w82-20020a376255000000b0069ee3f0ae63sm4478142qkb.45.2022.04.24.21.00.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Apr 2022 21:00:56 -0700 (PDT) From: Maxim Cournoyer Date: Sun, 24 Apr 2022 23:57:07 -0400 Message-Id: <20220425035918.25683-101-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220425035918.25683-1-maxim.cournoyer@gmail.com> References: <20220425035918.25683-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 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 * gnu/packages/python-xyz.scm (python-ipyparallel): Morph into... (python-ipyparallel-bootstrap): ... this, moving native inputs to a new definition of... (python-ipyparallel): ... this. --- gnu/packages/python-xyz.scm | 97 ++++++++++++++++++++++--------------- 1 file changed, 58 insertions(+), 39 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ce0172e59f..6a8eb11f64 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8740,47 +8740,41 @@ (define-public python-ipython-genutils (define-public python2-ipython-genutils (package-with-python2 python-ipython-genutils)) -(define-public python-ipyparallel - (package - (name "python-ipyparallel") - (version "6.2.4") - (source +;;; Variant used to break a cycle with python-ipykernel. +(define-public python-ipyparallel-bootstrap + (hidden-package + (package + (name "python-ipyparallel-bootstrap") + (version "6.2.4") + (source (origin (method url-fetch) (uri (pypi-uri "ipyparallel" version)) (sha256 (base32 "0rf0dbpxf5z82bw8lsjj45r3wdd4wc74anz4wiiaf2rbjqlb1ivn")))) - (build-system python-build-system) - (arguments - `(#:tests? #f ; RuntimeError: IO Loop failed to start - #:phases - (modify-phases %standard-phases - (add-before 'check 'prepare-for-tests - (lambda _ - (setenv "HOME" (getcwd)) - #t))))) - (propagated-inputs - (list python-dateutil - python-decorator - python-ipykernel - python-ipython - python-ipython-genutils - python-jupyter-client - python-pyzmq - python-tornado - python-traitlets)) - (native-inputs - (list python-ipython - python-mock - python-nose - python-pytest - python-pytest-cov - python-testpath)) - (home-page "https://ipython.org/") - (synopsis "Interactive Parallel Computing with IPython") - (description - "@code{ipyparallel} is a Python package and collection of CLI scripts for + (build-system python-build-system) + (arguments + (list + #:tests? #f + #:phases #~(modify-phases %standard-phases + ;; The python-ipykernel is normally propagated but is + ;; removed from this package to break the cycle. + (delete 'sanity-check)))) + (propagated-inputs + (list python-dateutil + python-decorator + ;; python-ipykernel is omitted here to avoid a cycle. + python-ipython + python-ipython-genutils + python-jupyter-client-bootstrap + python-pyzmq + python-tornado + python-traitlets)) + (home-page "https://ipython.org/") + (synopsis "Interactive Parallel Computing with IPython") + (description + "@code{ipyparallel} is a Python package and collection of CLI scripts for controlling clusters for Jupyter. @code{ipyparallel} contains the following CLI scripts: @enumerate @@ -8788,7 +8782,26 @@ (define-public python-ipyparallel @item ipcontroller - start a scheduler @item ipengine - start an engine @end enumerate") - (license license:bsd-3))) + (license license:bsd-3)))) + +(define-public python-ipyparallel + (package + (inherit python-ipyparallel-bootstrap) + (name "python-ipyparallel") + (arguments (list #:tests? #t)) + (native-inputs + (list python-ipython + python-mock + python-nose + python-pytest + python-pytest-cov + python-testpath)) + (propagated-inputs + (modify-inputs (package-propagated-inputs python-ipyparallel-bootstrap) + (replace "python-jupyter-client-bootstrap" python-jupyter-client) + (append python-ipykernel))) + (properties (alist-delete 'hidden? (package-properties + python-ipyparallel-bootstrap))))) (define-public python-ipython-cluster-helper (package @@ -9077,10 +9090,16 @@ (define-public python-ipykernel-bootstrap (package (inherit parent) (name "python-ipykernel-bootstrap") + (arguments (list #:tests? #f + ;; The package should normally propagate ipykernel, + ;; left out here to break the cycle. + #:phases #~(modify-phases %standard-phases + (delete 'sanity-check)))) + (native-inputs '()) (propagated-inputs - `(("python-jupyter-client" ,python-jupyter-client-bootstrap) - ,@(fold alist-delete (package-propagated-inputs parent) - '("python-jupyter-client")))))))) + (modify-inputs (package-propagated-inputs parent) + (replace "python-jupyter-client" python-jupyter-client-bootstrap) + (append python-ipyparallel-bootstrap))))))) (define-public python-pari-jupyter (package