GNU bug report logs - #70855
[PATCH 00/92] python-team patches

Previous Next

Full log

View this message in rfc822 format

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 70855 <at> debbugs.gnu.org
Cc: ngraves <at> ngraves.fr
Subject: [bug#70855] [PATCH 12/92] gnu: python-docker-pycreds: Move to pyproject-build-system.
Date: Fri, 10 May 2024 00:53:07 +0200

* 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 <jessedowell <at> gmail.com>
 ;;; Copyright © 2021, 2022 Oleg Pykhalov <go.wigust <at> gmail.com>
 ;;; Copyright © 2022 Pierre Langlois <pierre.langlois <at> gmx.com>
+;;; Copyright © 2024 Nicolas Graves <ngraves <at> ngraves.fr>
 ;;;
 ;;; 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")
-- 
2.41.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.