From patchwork Tue Feb 20 23:43:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60841 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 3B35E27BBE9; Tue, 20 Feb 2024 23:47:10 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 6517D27BBEA for ; Tue, 20 Feb 2024 23:47:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcZp0-00081c-Ps; Tue, 20 Feb 2024 18:46:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcZnz-0007Fh-St for guix-patches@gnu.org; Tue, 20 Feb 2024 18:45:43 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rcZny-0000Ed-Mr; Tue, 20 Feb 2024 18:45:43 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rcZoK-0000XA-Cl; Tue, 20 Feb 2024 18:46:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69295] [PATCH 06/46] gnu: parfive: Simplify package. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Tue, 20 Feb 2024 23:46:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69295 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69295@debbugs.gnu.org Cc: Sharlatan Hellseher , Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , jgart Received: via spool by 69295-submit@debbugs.gnu.org id=B69295.17084727441715 (code B ref 69295); Tue, 20 Feb 2024 23:46:04 +0000 Received: (at 69295) by debbugs.gnu.org; 20 Feb 2024 23:45:44 +0000 Received: from localhost ([127.0.0.1]:47004 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcZnz-0000RM-7x for submit@debbugs.gnu.org; Tue, 20 Feb 2024 18:45:43 -0500 Received: from mail-wm1-f45.google.com ([209.85.128.45]:53712) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcZnl-0000O8-Nz for 69295@debbugs.gnu.org; Tue, 20 Feb 2024 18:45:31 -0500 Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-41273e2186cso3375e9.3 for <69295@debbugs.gnu.org>; Tue, 20 Feb 2024 15:45:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708472642; x=1709077442; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=E1L+kg4WIdVp99S1Ms5xN6VSMAvr8VDD75tPcnqthrE=; b=HtDxXOZCDcx5J3YU6fKtM2uRTVTuGtDdfKdZXlLXUfPK9Rg8J/uITpHwcg1HuyMjPE 7OzvhJ1xOKbiWifnX8fh9fvw425B0SXdTONUzitpLDWWWQoOIsU6agV+Oshqb/8qW0z8 hANez4xtHbs6GRcrXBMN21YK10PDS3mc3AoFIyfoN65C6mtuWZ8WZTxgRXnyclhw0UOH bVccstIfBNbjDJyh0ADDGP7cfppq+RDQxi1E8zvUzQ/7hWix98dzzle4cz3MgFMcm+5h dcGkp1iu2d/zigNyOtmolLwvLkjPkz5kFMLIilB9wm1+KF5OHUHxhstHt4NfMd3SsvXH yPow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708472642; x=1709077442; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=E1L+kg4WIdVp99S1Ms5xN6VSMAvr8VDD75tPcnqthrE=; b=Pzfm8GZRswd/Qs/M0+yEwbjRD6epuw5KbKq8vfTObAIH7WcpJ5x5WQ31yUUh4jzUWc t9dWjfTyYkDOGWeu8ddh1tiMyPwgvtkA/LVfOoIspWqbU2aDFGmlnhe0MeDEnidGkW+E emFEraIrbiiCm14d+ay2eZWWCa/PchGj38yFpoNEdoLkrVD1Q43YAwx8H74qcUXRponm ru0P3hEpHQX5JpZ7HarZ/sIjJ29+tEK7XQgUvENghmK7MoETrV5bXU4N1VISDXhKMvE7 cUrq9xQEPHrL1W9vFbAxkpu2GMKd0TmYtkb+LdDJvV2N1zcGBFjeBOpW5bO74rnsz2Yt zAJQ== X-Gm-Message-State: AOJu0YxHKPpOBenNEPJlqEvVSx9XASpLyubejqpWaIuxhfORedOhSEZI 77J+S+ssLO9ZeRlWzRhEiiPn775pzJbyluhqOQCcofRzRZ+cdTbWeiKTs+kNT4jS8A== X-Google-Smtp-Source: AGHT+IEOFiaC2lYv5Ec637uNSwqe3FlyGJ429X6gkMU2SPka6c6FzL8aeH6DfNuihuqRBgY+Ig5KdA== X-Received: by 2002:a5d:43c4:0:b0:33d:3566:b5c8 with SMTP id v4-20020a5d43c4000000b0033d3566b5c8mr7164847wrr.13.1708472642083; Tue, 20 Feb 2024 15:44:02 -0800 (PST) Received: from guxtil.incerto.xyz (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id n22-20020a05600c4f9600b00411a6ce0f99sm16347385wmq.24.2024.02.20.15.44.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 15:44:01 -0800 (PST) From: Sharlatan Hellseher Date: Tue, 20 Feb 2024 23:43:04 +0000 Message-ID: <27805160caed540718c69eb55267906202a6be69.1708471786.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-web.scm (parfive) [build-system]: Swap to pyproject-build-system. [arguments] <#:phases>: Use standard 'check phase. <#:test-flags>: Move disabled tests here and remove 'disable-test-requiring-network phase. Change-Id: I08b67b2aa7027ac37e0a3df4da7ebb01ea3c451e --- gnu/packages/python-web.scm | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index adae8d7272..de57d5be94 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1326,18 +1326,15 @@ (define-public parfive (sha256 (base32 "0pf8rzfwxpkn84xzb4v8m1fy3k7kjlh8f9ln4y5xqlnbqpwi30lh")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases - (add-before 'check 'disable-test-requiring-network - (lambda _ - (substitute* "parfive/tests/test_downloader.py" - (("def test_ftp") - "def __off_test_ftp")))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "python" "-m" "pytest" "-vvv" "parfive"))))))) + (list + ;; Disable tests requiring network access. + #:test-flags + #~(list "-k" (string-append + "not test_ftp" + " and not test_ftp_pasv_command" + " and not test_ftp_http")))) (propagated-inputs (list python-aiofiles python-aioftp python-aiohttp python-tqdm)) (native-inputs (list python-pytest