diff options
| author | Nicolas Graves <ngraves@ngraves.fr> | 2024-05-10 00:53:07 +0200 |
|---|---|---|
| committer | Sharlatan Hellseher <sharlatanus@gmail.com> | 2024-12-13 20:18:48 +0000 |
| commit | 1c9a62192e50b44ab69f53e08148060be07d345a (patch) | |
| tree | 660ba7e6f2109bdc4563161298e16c125acb78d1 /gnu/packages | |
| parent | 2139b3724d7f8641c67cebc9671ce2f265f9c4e5 (diff) | |
gnu: python-docker-pycreds: Move to pyproject-build-system.
* 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
Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/docker.scm | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index b49dc58bd05..0abe85f01e4 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | ;;; Copyright © 2020 Jesse Dowell <jessedowell@gmail.com> | 8 | ;;; Copyright © 2020 Jesse Dowell <jessedowell@gmail.com> |
| 9 | ;;; Copyright © 2021, 2022 Oleg Pykhalov <go.wigust@gmail.com> | 9 | ;;; Copyright © 2021, 2022 Oleg Pykhalov <go.wigust@gmail.com> |
| 10 | ;;; Copyright © 2022 Pierre Langlois <pierre.langlois@gmx.com> | 10 | ;;; Copyright © 2022 Pierre Langlois <pierre.langlois@gmx.com> |
| 11 | ;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr> | ||
| 11 | ;;; | 12 | ;;; |
| 12 | ;;; This file is part of GNU Guix. | 13 | ;;; This file is part of GNU Guix. |
| 13 | ;;; | 14 | ;;; |
| @@ -35,6 +36,7 @@ | |||
| 35 | #:use-module (guix build-system gnu) | 36 | #:use-module (guix build-system gnu) |
| 36 | #:use-module (guix build-system go) | 37 | #:use-module (guix build-system go) |
| 37 | #:use-module (guix build-system python) | 38 | #:use-module (guix build-system python) |
| 39 | #:use-module (guix build-system pyproject) | ||
| 38 | #:use-module (guix utils) | 40 | #:use-module (guix utils) |
| 39 | #:use-module (gnu packages autotools) | 41 | #:use-module (gnu packages autotools) |
| 40 | #:use-module (gnu packages base) | 42 | #:use-module (gnu packages base) |
| @@ -47,6 +49,7 @@ | |||
| 47 | #:use-module (gnu packages networking) | 49 | #:use-module (gnu packages networking) |
| 48 | #:use-module (gnu packages pkg-config) | 50 | #:use-module (gnu packages pkg-config) |
| 49 | #:use-module (gnu packages python) | 51 | #:use-module (gnu packages python) |
| 52 | #:use-module (gnu packages python-build) | ||
| 50 | #:use-module (gnu packages python-crypto) | 53 | #:use-module (gnu packages python-crypto) |
| 51 | #:use-module (gnu packages python-web) | 54 | #:use-module (gnu packages python-web) |
| 52 | #:use-module (gnu packages python-xyz) | 55 | #:use-module (gnu packages python-xyz) |
| @@ -151,19 +154,12 @@ created and all the services are started as specified in the configuration.") | |||
| 151 | (sha256 | 154 | (sha256 |
| 152 | (base32 | 155 | (base32 |
| 153 | "1m44smrggnqghxkqfl7vhapdw89m1p3vdr177r6cq17lr85jgqvc")))) | 156 | "1m44smrggnqghxkqfl7vhapdw89m1p3vdr177r6cq17lr85jgqvc")))) |
| 154 | (build-system python-build-system) | 157 | (build-system pyproject-build-system) |
| 155 | (arguments | 158 | (arguments |
| 156 | `(#:phases | 159 | (list ; XXX: These tests require docker credentials to run. |
| 157 | (modify-phases %standard-phases | 160 | #:test-flags '(list "--ignore=tests/store_test.py"))) |
| 158 | (add-after 'unpack 'fix-versioning | ||
| 159 | (lambda _ | ||
| 160 | (substitute* "test-requirements.txt" | ||
| 161 | (("3.0.2") ,(package-version python-pytest)) | ||
| 162 | (("2.3.1") ,(package-version python-pytest-cov)) | ||
| 163 | (("2.4.1") ,(package-version python-flake8))) | ||
| 164 | #t))))) | ||
| 165 | (native-inputs | 161 | (native-inputs |
| 166 | (list python-flake8 python-pytest python-pytest-cov)) | 162 | (list python-pytest python-setuptools python-wheel)) |
| 167 | (propagated-inputs | 163 | (propagated-inputs |
| 168 | (list python-six)) | 164 | (list python-six)) |
| 169 | (home-page "https://github.com/shin-/dockerpy-creds") | 165 | (home-page "https://github.com/shin-/dockerpy-creds") |
