From patchwork Thu May 9 22:53:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 27249 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 B1F6627BBEA; Thu, 9 May 2024 23:57:45 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham 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 2D92127BBE2 for ; Thu, 9 May 2024 23:57:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s5ChP-0005tf-2A; Thu, 09 May 2024 18:57:15 -0400 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 1s5ChI-0005qc-AR for guix-patches@gnu.org; Thu, 09 May 2024 18:57:08 -0400 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 1s5ChI-0006QY-2M for guix-patches@gnu.org; Thu, 09 May 2024 18:57:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s5ChG-0002ed-DH for guix-patches@gnu.org; Thu, 09 May 2024 18:57:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70855] [PATCH 12/92] gnu: python-docker-pycreds: Move to pyproject-build-system. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 May 2024 22:57:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70855 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70855@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 70855-submit@debbugs.gnu.org id=B70855.17152953839832 (code B ref 70855); Thu, 09 May 2024 22:57:06 +0000 Received: (at 70855) by debbugs.gnu.org; 9 May 2024 22:56:23 +0000 Received: from localhost ([127.0.0.1]:41058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5CgY-0002YV-KE for submit@debbugs.gnu.org; Thu, 09 May 2024 18:56:22 -0400 Received: from 11.mo561.mail-out.ovh.net ([87.98.184.158]:42559) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5CgU-0002Y7-Le for 70855@debbugs.gnu.org; Thu, 09 May 2024 18:56:19 -0400 Received: from director3.ghost.mail-out.ovh.net (unknown [10.108.9.41]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id 4Vb6nb0ZP4z1LXj for <70855@debbugs.gnu.org>; Thu, 9 May 2024 22:56:19 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-8l4js (unknown [10.110.113.226]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id C7DE31FE12; Thu, 9 May 2024 22:56:18 +0000 (UTC) Received: from ngraves.fr ([37.59.142.108]) by ghost-submission-6684bf9d7b-8l4js with ESMTPSA id VB98KZJUPWbq8SYAWxf4dA (envelope-from ); Thu, 09 May 2024 22:56:18 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-108S002c73a101b-f5c4-4e83-9e35-85789548b265, E63BAB6C0A71DD4DA934779D5D345DF804807214) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Fri, 10 May 2024 00:53:07 +0200 Message-ID: <20240509225530.24649-12-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240509225530.24649-1-ngraves@ngraves.fr> References: <20240509225530.24649-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 6094214722028692194 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvdeffedgudeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvffehgeekhfekgffgleehffetiefggeeitdduteekfffhkeehveejfeejledtieenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrddutdeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejtdekheehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedupdhmohguvgepshhmthhpohhuth 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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/docker.scm (python-docker-pycreds): [build-system]: Move to pyproject-build-system. [arguments]<#:test-flags>: Use it. <#:phases>: Remove uneeded field. [native-inputs]: Remove python-pytest-cov and python-flake8. Add python-setuptools, python-wheel. Change-Id: Idde93a366fa187d2af915ed15801da2cdbaa3792 --- gnu/packages/docker.scm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index b18de182fe5..de1baa15172 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2020 Jesse Dowell ;;; Copyright © 2021, 2022 Oleg Pykhalov ;;; Copyright © 2022 Pierre Langlois +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,6 +36,7 @@ (define-module (gnu packages docker) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system python) + #:use-module (guix build-system pyproject) #:use-module (guix utils) #:use-module (gnu packages autotools) #:use-module (gnu packages base) @@ -47,6 +49,7 @@ (define-module (gnu packages docker) #:use-module (gnu packages networking) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) @@ -151,19 +154,12 @@ (define-public python-docker-pycreds (sha256 (base32 "1m44smrggnqghxkqfl7vhapdw89m1p3vdr177r6cq17lr85jgqvc")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-versioning - (lambda _ - (substitute* "test-requirements.txt" - (("3.0.2") ,(package-version python-pytest)) - (("2.3.1") ,(package-version python-pytest-cov)) - (("2.4.1") ,(package-version python-flake8))) - #t))))) + (list ; XXX: These tests require docker credentials to run. + #:test-flags '(list "--ignore=tests/store_test.py"))) (native-inputs - (list python-flake8 python-pytest python-pytest-cov)) + (list python-pytest python-setuptools python-wheel)) (propagated-inputs (list python-six)) (home-page "https://github.com/shin-/dockerpy-creds")