From patchwork Sun May 15 04:37:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 39354 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 0733127BBEA; Sun, 15 May 2022 06:05:19 +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 3845B27BBE9 for ; Sun, 15 May 2022 06:05:18 +0100 (BST) Received: from localhost ([::1]:37758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nq6RR-0007qX-6x for patchwork@mira.cbaines.net; Sun, 15 May 2022 01:05:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43492) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nq6Ih-0000ZY-1y for guix-patches@gnu.org; Sun, 15 May 2022 00:56:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54395) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nq6Ig-0006dK-Op for guix-patches@gnu.org; Sun, 15 May 2022 00:56:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nq6Ig-0003ce-Nr for guix-patches@gnu.org; Sun, 15 May 2022 00:56:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55424] [PATCH 062/602] gnu: Remove python2-pandas. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 04:56:14 +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.165259054013515 (code B ref 55424); Sun, 15 May 2022 04:56:14 +0000 Received: (at 55424) by debbugs.gnu.org; 15 May 2022 04:55:40 +0000 Received: from localhost ([127.0.0.1]:48218 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq6I1-0003Vb-HN for submit@debbugs.gnu.org; Sun, 15 May 2022 00:55:40 -0400 Received: from mail-qt1-f178.google.com ([209.85.160.178]:39673) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq6AR-0002xr-3s for 55424@debbugs.gnu.org; Sun, 15 May 2022 00:47:43 -0400 Received: by mail-qt1-f178.google.com with SMTP id x9so10080169qts.6 for <55424@debbugs.gnu.org>; Sat, 14 May 2022 21:47:43 -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=04lvQfAAJJY3ifqXZfqYfGwmZW5EOa0t+WaGHRo1tdI=; b=YETpJYvmCBC0ALkFaN0wLA8Q6qUQbqGUX2Yu/m/6DbTGreuw9s2vWeoCQ0fmNOQ9Cv WZJg2X9WaJ21N9RFguuYr54JVGw4BP3xYb5Y6H8fLK81z+MFY1a60fUECf6IOMD4uf0c tpJJPPFiERxyKqdx4ujWbE49Iyz2zqfdsAJOUYhdAI+L15nfzdVWFgrfEGRNf+3DKgma g0RpEk+4KOU/ma4mpiGyolW9akGgAxyxLzSh5KRL9FMRtwkWJ1Ii2zzjxsm5YPD4c/Wp NTH0RIFZv/RVUZrQwYNwrmsI23PhWWQoooz4feGF2cOBb3kLfEHreWyF51p4Y2Ls3KWS BV0w== 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=04lvQfAAJJY3ifqXZfqYfGwmZW5EOa0t+WaGHRo1tdI=; b=6FPruXAMT41Lqy5Ff/b4oAXXiWIDNfj8GR72k/UYFy/7Nv1ZQTZpxNtQh8rVPs388Q 5YIDKoApThZEQUXvTAien8Jz7rg3lItq6LsGzIg11aKSNjCAyJhbx7lFCrkigHlfi1mj RZBcG3XbrGaQO2ximdfRqM/Ezr5syIfbD+TNnUIN0BDvIXjI65vpZRlZCgvo6AFaCrht VfOfc6K1kEPkXr53LaJxU9llYzIrbZ2lH2Mq3VsildaXrLRwOXL807ONGNMQx5XICgQI kHHr9RiRS7agUk/d1QOXDDWD43kmdFnBc9QU1NRxc2WPgoKqQs0oz8hta4ZQ4zy+Sn0j K3dg== X-Gm-Message-State: AOAM530jQU+BD6qiIn33lne5/imnbsbmFMgWFVDlLjn/MeDRPKjwEH7H vI2N5bcy5EW/3/4+okKlui/ON7ZtmdyAcg== X-Google-Smtp-Source: ABdhPJx3QQ/AyFq05Xyi+wvGzGgTxJc9jCXLVbdMnpcHKJr/NBUs/EQRfV0HYyrAYfQopAqV0YeyAA== X-Received: by 2002:a05:622a:5cf:b0:2f3:c5cf:45fe with SMTP id d15-20020a05622a05cf00b002f3c5cf45femr10893530qtb.633.1652590057448; Sat, 14 May 2022 21:47:37 -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.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 21:47:37 -0700 (PDT) From: Maxim Cournoyer Date: Sun, 15 May 2022 00:37:29 -0400 Message-Id: <20220515044629.6843-62-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/python-science.scm (python2-pandas): Delete variable. (python-pandas): Delete related python2-variant property. --- gnu/packages/python-science.scm | 98 --------------------------------- 1 file changed, 98 deletions(-) diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index bf7c7ce45f..b3f39fd19d 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -488,106 +488,8 @@ (define-public python-pandas multidimensional, potentially heterogeneous) and time series data both easy and intuitive. It aims to be the fundamental high-level building block for doing practical, real world data analysis in Python.") - (properties `((python2-variant . ,(delay python2-pandas)))) (license license:bsd-3))) -;; Pandas 0.24.x are the last versions that support Python 2. -(define-public python2-pandas - (let ((pandas (package-with-python2 - (strip-python2-variant python-pandas)))) - (package - (inherit pandas) - (version "0.24.2") - (source (origin - (method url-fetch) - (uri (pypi-uri "pandas" version)) - (sha256 - (base32 - "18imlm8xbhcbwy4wa957a1fkamrcb0z988z006jpfda3ki09z4ag")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Adjust for renamed error message in Python 2.7.17. Taken - ;; from . - (substitute* "pandas/io/parsers.py" - (("if 'NULL byte' in msg:") - "if 'NULL byte' in msg or 'line contains NUL' in msg:")))))) - (arguments - `(#:modules ((guix build utils) - (guix build python-build-system) - (ice-9 ftw) - (srfi srfi-26)) - #:python ,python-2 - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-which - (lambda* (#:key inputs #:allow-other-keys) - (let ((which (assoc-ref inputs "which"))) - (substitute* "pandas/io/clipboard/__init__.py" - (("^CHECK_CMD = .*") - (string-append "CHECK_CMD = \"" which "\"\n")))))) - (replace 'check - (lambda _ - (let ((build-directory - (string-append - (getcwd) "/build/" - (car (scandir "build" - (cut string-prefix? "lib." <>)))))) - ;; Disable the "strict data files" option which causes - ;; the build to error out if required data files are - ;; not available (as is the case with PyPI archives). - (substitute* "setup.cfg" - (("addopts = --strict-data-files") "addopts = ")) - (with-directory-excursion build-directory - ;; Delete tests that require "moto" which is not yet - ;; in Guix. - (for-each delete-file - '("pandas/tests/io/conftest.py" - "pandas/tests/io/json/test_compression.py" - "pandas/tests/io/parser/test_network.py" - "pandas/tests/io/test_parquet.py")) - (invoke "pytest" "-vv" "pandas" "--skip-slow" - "--skip-network" "-k" - ;; XXX: Due to the deleted tests above. - "not test_read_s3_jsonl")))))))) - (propagated-inputs - (list python2-numpy python2-openpyxl python2-pytz python2-dateutil - python2-xlrd)) - (inputs - (list which)) - (native-inputs - (list python2-cython - python2-beautifulsoup4 - python2-lxml - python2-html5lib - python2-nose - python2-pytest - python2-pytest-mock))))) - -(define-public python2-pyflow - (package - (name "python2-pyflow") - (version "1.1.20") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/Illumina/pyflow/releases/download/v" - version "/pyflow-" version ".tar.gz")) - (sha256 - (base32 - "1bvfvviw58cndyn862qnv9nj3d9cd3a0dm4vc4sd9vwq8a6z1riv")))) - (build-system python-build-system) - (arguments - `(#:tests? #f ; There is no test suite. - ;; There is no official Python 3-compatible version and upstream is - ;; dead. See https://github.com/Illumina/pyflow/issues/20. - #:python ,python-2)) - (home-page "https://illumina.github.io/pyflow/") - (synopsis "Tool to manage tasks in a task dependency graph") - (description "This package is a Python module to manage tasks in the -context of a task dependency graph. It has some similarities to make.") - (license license:bsd-2))) - (define-public python-pythran (package (name "python-pythran")