From patchwork Fri Jan 14 20:09:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 36333 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 58C9B27BBE9; Fri, 14 Jan 2022 20:11:40 +0000 (GMT) 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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, 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 D7FA927BBEA for ; Fri, 14 Jan 2022 20:11:39 +0000 (GMT) Received: from localhost ([::1]:40540 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n8SvD-0002iu-0E for patchwork@mira.cbaines.net; Fri, 14 Jan 2022 15:11:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n8Suj-0002bw-Ir for guix-patches@gnu.org; Fri, 14 Jan 2022 15:11:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45365) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n8Sug-0001Ii-8o for guix-patches@gnu.org; Fri, 14 Jan 2022 15:11:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n8Sug-0003uE-5J for guix-patches@gnu.org; Fri, 14 Jan 2022 15:11:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52696] [PATCH v2 11/11] gnu: orange: Update to 3.31.1. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 14 Jan 2022 20:11:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52696 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52696@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 52696-submit@debbugs.gnu.org id=B52696.164219106214954 (code B ref 52696); Fri, 14 Jan 2022 20:11:06 +0000 Received: (at 52696) by debbugs.gnu.org; 14 Jan 2022 20:11:02 +0000 Received: from localhost ([127.0.0.1]:38259 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8Suc-0003sw-Bp for submit@debbugs.gnu.org; Fri, 14 Jan 2022 15:11:02 -0500 Received: from mout01.posteo.de ([185.67.36.65]:43781) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8Sub-0003sJ-1P for 52696@debbugs.gnu.org; Fri, 14 Jan 2022 15:11:01 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 7B6A7240026 for <52696@debbugs.gnu.org>; Fri, 14 Jan 2022 21:10:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1642191055; bh=peSnHXdHnt1AYMSg4D1qG5fg/HLVrjRDhgWhJxSOXo4=; h=From:To:Cc:Subject:Date:From; b=jQrEd4eKarA3FMYQBG4igAsZkX3u+UcouAWJWiQf7pc71jz1MWYd6D8+gC/uehDkp SaxA2ukiHN3ZcPB30cBBEWDxhq8rf6MKz3YmGTSqut7bf4EE4zNkulNTmS9RJEJpRa 8cM2f8zRyYUO84IhGZMyv9F4ztYP8kjQjOsXt9e3KBLQ/mUA40zWNOaikzgw4ik8cp uPPb9kjLwQBNAuUrpFBQZ5PpgS3ra/N81FKRW274rsvQEiIpVVvL7nMQ9Z49ibvMid AiwP2KE9yBzyY79+UeZ93AqqnxGD7tebdd714lSNawX/ppxujGxgjkvDMcBXd9hztw KKr4fTaZC15WQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JbC9B4SZ5z9rxM; Fri, 14 Jan 2022 21:10:54 +0100 (CET) From: Vinicius Monego Date: Fri, 14 Jan 2022 20:09:27 +0000 Message-Id: <20220114200927.165685-11-monego@posteo.net> In-Reply-To: <20220114200927.165685-1-monego@posteo.net> References: <20220114200927.165685-1-monego@posteo.net> 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/orange.scm (orange): Update to 3.31.1. [arguments]<#:phases>: Don't return #t. Adjust file name for substitution in 'preparations. Rename 'set-HOME to 'pre-check. Set QT_QPA_PLATFORM in 'pre-check. [inputs]: Add python-pygments, python-qtconsole. --- gnu/packages/orange.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gnu/packages/orange.scm b/gnu/packages/orange.scm index 710be87cb0..2b6fc00abc 100644 --- a/gnu/packages/orange.scm +++ b/gnu/packages/orange.scm @@ -102,13 +102,13 @@ GUI based workflow. It is primarily used in the Orange framework.") (define-public orange (package (name "orange") - (version "3.28.0") + (version "3.31.1") (source (origin (method url-fetch) (uri (pypi-uri "Orange3" version)) (sha256 - (base32 "1ac4xjjkx06z10hl7k0zh1z3qhkl5vng15l9jkpkmck9spinbzil")))) + (base32 "0jqay46nysgfxldik7f6mfi8iylai2gwfpq60vklrfi1rhqf3pn6")))) (build-system python-build-system) (arguments `(#:phases @@ -125,11 +125,12 @@ GUI based workflow. It is primarily used in the Orange framework.") ;; We use a correct version of PyQtWebEngine, but the build scripts ;; consider it incorrect anyways. Remove the constraint entirely to ;; work around this bug. - (substitute* "requirements-gui.txt" (("PyQtWebEngine>=5.12") "")) - #t)) - (add-before 'check 'set-HOME + (substitute* "requirements-pyqt.txt" (("PyQtWebEngine>=5.12") "")))) + (add-before 'check 'pre-check ;; Tests need a writable home. - (lambda _ (setenv "HOME" "/tmp") #t)) + (lambda _ + (setenv "HOME" "/tmp") + (setenv "QT_QPA_PLATFORM" "offscreen"))) (add-after 'install 'wrap-executable ;; Ensure that icons are found at runtime. (lambda* (#:key inputs outputs #:allow-other-keys) @@ -137,8 +138,7 @@ GUI based workflow. It is primarily used in the Orange framework.") (wrap-program (string-append out "/bin/orange-canvas") `("QT_PLUGIN_PATH" prefix ,(list (string-append (assoc-ref inputs "qtsvg") - "/lib/qt5/plugins/"))))) - #t))))) + "/lib/qt5/plugins/")))))))))) (native-inputs (list python-cython)) (inputs @@ -159,10 +159,12 @@ GUI based workflow. It is primarily used in the Orange framework.") python-orange-canvas-core python-orange-widget-base python-pandas + python-pygments python-pyqt python-pyqtgraph python-pyqtwebengine python-pyyaml + python-qtconsole python-requests python-scikit-learn python-scipy