From patchwork Sun May 15 04:37: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: 39292 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 50C1627BBEB; Sun, 15 May 2022 05:54:30 +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 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 3E7B227BBE9 for ; Sun, 15 May 2022 05:54:29 +0100 (BST) Received: from localhost ([::1]:52536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nq6Gx-0006Hg-8Q for patchwork@mira.cbaines.net; Sun, 15 May 2022 00:54:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42792) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nq6Fc-0005fj-3p for guix-patches@gnu.org; Sun, 15 May 2022 00:53:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54139) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nq6Fb-0005m8-RF for guix-patches@gnu.org; Sun, 15 May 2022 00:53:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nq6Fb-0003Eu-K3 for guix-patches@gnu.org; Sun, 15 May 2022 00:53:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55424] [PATCH 060/602] gnu: Remove python2-scikit-learn. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 04:53:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55424 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55424@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 55424-submit@debbugs.gnu.org id=B55424.165259037512399 (code B ref 55424); Sun, 15 May 2022 04:53:03 +0000 Received: (at 55424) by debbugs.gnu.org; 15 May 2022 04:52:55 +0000 Received: from localhost ([127.0.0.1]:48029 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq6FT-0003Dq-7a for submit@debbugs.gnu.org; Sun, 15 May 2022 00:52:55 -0400 Received: from mail-qk1-f182.google.com ([209.85.222.182]:41826) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq6FR-0003DP-2W for 55424@debbugs.gnu.org; Sun, 15 May 2022 00:52:53 -0400 Received: by mail-qk1-f182.google.com with SMTP id k8so10198797qki.8 for <55424@debbugs.gnu.org>; Sat, 14 May 2022 21:52:52 -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=d9FNjJg3dT/cgIhk/fwzs2eoJkSuG/mkYtZQYbMnFzw=; b=Vx1dPlLvM3Ikrk7JXWDIuBZ3W9ffIH+905kU32oa/nI66xyquVeRB2A97MMuWV0qx6 7uqH64HLlUt2A8FND4RmLXGrDqnIvU1uPI/CkHHPQeS/b7DEDWlgfm/+4kVkta9q+5j/ lbLM6IT3VQVTz+aCx0zEreqcfNIuOl4R7WrKBn4cNY12KFHqi3OOf4Et/YuEI9jjXgUm DI8dr8WU7PJZeSXTvIUxMix/UPRiw7wzH/BWzCZQtbrPJMmSxtAtz/8zb2FK4hza/LCl DIC6f0Yvr84WFhxUR7dm/T7Ll8UbtHKsigl6HRXFV41Zl7tpAl5WLG6zrCU3a94pKXy8 H9/g== 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=d9FNjJg3dT/cgIhk/fwzs2eoJkSuG/mkYtZQYbMnFzw=; b=nDu+1uQD50cdBxuCw/5iVOz9zpyggigsHD/Gyz8JrEUwpnQzCQrC2X17y7NiGEFWTe okTdBlglldRiBScDzZaAndbiOblkKVZIQxTZUVN1oXUzp4hOdPNbd3quzSoIHynW8jvc BdTfliatR0wuQSU2aqXjBCF+PTZgNTAvv+7YyWWal82dxx5scWOt5RzloLzqCdOlTYjd kZTpIyKxNTUUhyZDa1jNjl1RY69ZGGVeaAOB5yuEuKrtKs53wOEBrLtNlH7oUseXNNMh zgcyXNlvQ/wvvDvz4CdNgvc9XmB3AaHWa8shbJDbLrF7PPjIsuErkDBZm4Fxo7vZjMD8 TjFQ== X-Gm-Message-State: AOAM532+xiqs5mmryaQPGjAnBE4xM86lNai3hahOvzQdBMQKPSZ2gsTR NHZp2W0h/hnMORXx84Cdb5j1rWu5DNkxuA== X-Google-Smtp-Source: ABdhPJwPocS2eKTNE1egqU6L48DQvUWcOi3IpOV/fYzqQmRmI+zFdpCnRPlK0f0V24pIVq0Q9CvJnA== X-Received: by 2002:a05:622a:256:b0:2f3:ebbe:4c84 with SMTP id c22-20020a05622a025600b002f3ebbe4c84mr10839046qtx.541.1652590056137; Sat, 14 May 2022 21:47:36 -0700 (PDT) Received: from localhost.localdomain (dsl-149-239.b2b2c.ca. [66.158.149.239]) by smtp.gmail.com with ESMTPSA id 2-20020ac82082000000b002f39b99f672sm4287690qtd.12.2022.05.14.21.47.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 21:47:35 -0700 (PDT) From: Maxim Cournoyer Date: Sun, 15 May 2022 00:37:27 -0400 Message-Id: <20220515044629.6843-60-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515044629.6843-1-maxim.cournoyer@gmail.com> References: <20220515044629.6843-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/machine-learning.scm (python2-scikit-learn): Delete variable. (python-scikit-learn)[properties]: Remove the python2-variant property. --- gnu/packages/machine-learning.scm | 47 ------------------------------- 1 file changed, 47 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 3897342345..02cd6b31aa 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1128,55 +1128,8 @@ (define-public python-scikit-learn (description "Scikit-learn provides simple and efficient tools for data mining and data analysis.") - (properties `((python2-variant . ,(delay python2-scikit-learn)))) (license license:bsd-3))) -;; scikit-learn 0.22 and later only supports Python 3, so we stick with -;; an older version here. -(define-public python2-scikit-learn - (let ((base (package-with-python2 (strip-python2-variant python-scikit-learn)))) - (package - (inherit base) - (version "0.20.4") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/scikit-learn/scikit-learn") - (commit version))) - (file-name (git-file-name "python-scikit-learn" version)) - (sha256 - (base32 - "08zbzi8yx5wdlxfx9jap61vg1malc9ajf576w7a0liv6jvvrxlpj")))) - (arguments - `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - (add-after 'build 'build-ext - (lambda _ (invoke "python" "setup.py" "build_ext" "--inplace"))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; Restrict OpenBLAS threads to prevent segfaults while testing! - (setenv "OPENBLAS_NUM_THREADS" "1") - - ;; Some tests require write access to $HOME. - (setenv "HOME" "/tmp") - - (invoke "pytest" "sklearn" "-m" "not network" - "-k" - (string-append - ;; This test tries to access the internet. - "not test_load_boston_alternative" - ;; This test fails for unknown reasons - " and not test_rank_deficient_design")))))))) - (inputs - (list openblas)) - (native-inputs - (list python2-pytest python2-pandas ;for tests - python2-cython)) - (propagated-inputs - (list python2-numpy python2-scipy python2-joblib))))) - (define-public python-threadpoolctl (package (name "python-threadpoolctl")