From patchwork Mon Apr 25 03:55:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 38794 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 0981727BBEA; Mon, 25 Apr 2022 05:14:09 +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 4C69F27BBE9 for ; Mon, 25 Apr 2022 05:14:08 +0100 (BST) Received: from localhost ([::1]:59288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1niq6x-0008Ur-DU for patchwork@mira.cbaines.net; Mon, 25 Apr 2022 00:14:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1niptO-0007d2-1t for guix-patches@gnu.org; Mon, 25 Apr 2022 00:00:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38482) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1niptN-0001EL-BW for guix-patches@gnu.org; Mon, 25 Apr 2022 00:00:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1niptN-0007ku-3U for guix-patches@gnu.org; Mon, 25 Apr 2022 00:00:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55104] [PATCH 001/232] gnu: python-ipython: Re-order fields. References: <20220425035714.25466-1-maxim.cournoyer@gmail.com> In-Reply-To: <20220425035714.25466-1-maxim.cournoyer@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Apr 2022 04:00:04 +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.165085918929582 (code B ref 55104); Mon, 25 Apr 2022 04:00:04 +0000 Received: (at 55104) by debbugs.gnu.org; 25 Apr 2022 03:59:49 +0000 Received: from localhost ([127.0.0.1]:60573 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nipt3-0007gl-67 for submit@debbugs.gnu.org; Sun, 24 Apr 2022 23:59:49 -0400 Received: from mail-qk1-f172.google.com ([209.85.222.172]:36456) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nipsw-0007gN-31 for 55104@debbugs.gnu.org; Sun, 24 Apr 2022 23:59:43 -0400 Received: by mail-qk1-f172.google.com with SMTP id d19so9978992qko.3 for <55104@debbugs.gnu.org>; Sun, 24 Apr 2022 20:59:37 -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:mime-version :content-transfer-encoding; bh=+k4r2JQPbFDIXhr8RYDWx56JSzg+0lILLm3ku5GEeEI=; b=DrHYTzvMgIABPc1XQVNT4tFKX58Q96ezjMLtIDR68sQqjMQ8fxedjGneiDFmPZtdm0 YNMffv0Z8010HwEgHq0qVTrN+E87g/BjKByuP7UwNhoy4l/7w3ZantARmpLbP8Dl7gva SEp7Ck1/bfWB4QNFtSs7qIjdVRQGvUtSreeuzP6rkJ6E+lY6VIjQS/SeiS44Pdw16HXl H6nwlfcpvWD9P/dxqc8jGYwnQxNztMt0kTQ7Rwb39ivy5Zn7fGHPagmcLGGgyuRBRWlh sLaaHYY3AOwWe27ne683BHrouyXqtqcW+o/z2d7/Rrh99vq094B3icgIPpx6ByPBD1bL M9TA== 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:mime-version :content-transfer-encoding; bh=+k4r2JQPbFDIXhr8RYDWx56JSzg+0lILLm3ku5GEeEI=; b=XozMC0YFnKSYz+Kt5a6xpS7EohuuOPU7U/GbynrVheOwIMpFYjKRCUm1lWHPOfS2Yp ZfgE13Ls6IFGBkxQq86F9zYZfZJFSt5CFieNk5ZF2e4pdmXqqG1mW825bJu4StuptiCC fvXltI6ou22+dcRSW+ecGHjDw0IgMB5GgcgWTAMH1TmO7Bsn+2V4MgLxiw3XJ+ZNQ9Xb H8AwJr4d6NuDa7kk6MQW9F/Ih3xI02+GUYR7IEilIEPFkzFasXQPEdZ3jgVw+kiuMnRr clg4JpUO8epESTU2KvsmOeBkxJ3Jv+SiUzfFgQQTVzWX4LMqCfsLs0Qo+/rANn+qyL/6 WlqQ== X-Gm-Message-State: AOAM533CT3hO74iBAkunVlkn96OY9MmKdxHtkt0etfGH5eh4GcunY/6k KsdJhqV0jJ605ApFVcmxQpdWZGNd4iqcaA== X-Google-Smtp-Source: ABdhPJz8V02O28mpoMhFH0PDCXyAC127QZ4XYFU9qwv0D7Hprpw8Gw6DY/4467xkBVdqvTbu17E3IQ== X-Received: by 2002:a05:620a:424b:b0:67d:36cc:5afb with SMTP id w11-20020a05620a424b00b0067d36cc5afbmr9198264qko.598.1650859172033; Sun, 24 Apr 2022 20:59:32 -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.20.59.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Apr 2022 20:59:31 -0700 (PDT) From: Maxim Cournoyer Date: Sun, 24 Apr 2022 23:55:27 -0400 Message-Id: <20220425035918.25683-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.34.0 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-ipython): Move the 'arguments' field right after the 'build-system' one, Re-indent 'inputs' field. [propagated-inputs]: Sort inputs. --- gnu/packages/python-xyz.scm | 79 +++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 42 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9a5d311680..cde86ba007 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8986,33 +8986,6 @@ (define-public python-ipython (sha256 (base32 "04xgymypnbfgf2q0d5b0hanjbjsp53f055sh1p8xlq52vyzmxdaq")))) (build-system python-build-system) - (propagated-inputs - (list python-backcall - python-pyzmq - python-prompt-toolkit-2 - python-terminado - python-matplotlib - python-matplotlib-inline - python-numpy - python-numpydoc - python-jedi - python-jinja2 - python-mistune - python-pexpect - python-pickleshare - python-simplegeneric - python-jsonschema - python-traitlets - python-nbformat - python-pygments)) - (inputs - (list readline which)) - (native-inputs - (list graphviz - pkg-config - python-requests ;; for tests - python-testpath - python-nose)) (arguments `(#:phases (modify-phases %standard-phases @@ -9022,20 +8995,6 @@ (define-public python-ipython ((".*import datetime") "") ((".*datetime.datetime.now\\(\\)") "") (("%timeit") "# %timeit")))) - ;; Tests can only be run after the library has been installed and not - ;; within the source directory. - (delete 'check) - (add-after 'install 'check - (lambda* (#:key inputs outputs tests? #:allow-other-keys) - (if tests? - (begin - ;; Make installed package available for running the tests - (add-installed-pythonpath inputs outputs) - (setenv "HOME" "/tmp/") ;; required by a test - ;; We only test the core because one of the other tests - ;; tries to import ipykernel. - (invoke "python" "IPython/testing/iptest.py" - "-v" "IPython/core/tests"))))) (add-before 'check 'fix-tests (lambda* (#:key inputs #:allow-other-keys) (substitute* "./IPython/utils/_process_posix.py" @@ -9050,7 +9009,43 @@ (define-public python-ipython (delete-file "IPython/core/tests/test_interactiveshell.py") ;; AttributeError: module 'matplotlib_inline' has no ;; attribute 'backend_inline' - (delete-file "IPython/core/tests/test_pylabtools.py")))))) + (delete-file "IPython/core/tests/test_pylabtools.py"))) + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + ;; Make installed package available for running the tests + (add-installed-pythonpath inputs outputs) + (setenv "HOME" "/tmp/") ;; required by a test + ;; We only test the core because one of the other tests + ;; tries to import ipykernel. + (invoke "python" "IPython/testing/iptest.py" + "-v" "IPython/core/tests"))))))) + (inputs (list readline which)) + (propagated-inputs + (list python-backcall + python-jedi + python-jinja2 + python-jsonschema + python-matplotlib + python-matplotlib-inline + python-mistune + python-nbformat + python-numpy + python-numpydoc + python-pexpect + python-pickleshare + python-prompt-toolkit-2 + python-pygments + python-pyzmq + python-simplegeneric + python-terminado + python-traitlets)) + (native-inputs + (list graphviz + pkg-config + python-requests ;for tests + python-testpath + python-nose)) (home-page "https://ipython.org") (synopsis "IPython is a tool for interactive computing in Python") (description