[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
100/201: gnu: python-pytest-6: Fix version via setuptools-scm.
From: |
guix-commits |
Subject: |
100/201: gnu: python-pytest-6: Fix version via setuptools-scm. |
Date: |
Mon, 1 Nov 2021 23:18:48 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit fb0206aa1b915fcaee1969b90214c9ca1bd05b3b
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Sep 29 10:13:15 2021 -0400
gnu: python-pytest-6: Fix version via setuptools-scm.
* gnu/packages/check.scm (python-pytest-6): Fix indentation.
[phases]{fix-version}: Rename to...
{pretend-version}: ... this. Use the supported setuptools-scm mechanism to
manually fix the version string, as suggested upstream.
---
gnu/packages/check.scm | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index e6883df..8f18b27 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -981,21 +981,19 @@ standard library.")
(arguments
`(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'fix-version
+ (add-before 'build 'pretend-version
;; The version string is usually derived via setuptools-scm, but
;; without the git metadata available, the version string is set to
;; '0.0.0'.
(lambda _
- (substitute* "setup.py"
- (("setup\\(\\)")
- (format #f "setup(version=~s)" ,version)))))
+ (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" ,version)))
(replace 'check
(lambda* (#:key (tests? #t) #:allow-other-keys)
(setenv "TERM" "dumb") ;attempt disabling markup tests
(if tests?
(invoke "pytest" "-vv" "-k"
(string-append
- ;; This test involve the /usr directory, and fails.
+ ;; This test involves the /usr directory, and fails.
" not test_argcomplete"
;; These test do not honor the isatty detection and
;; fail.
- 190/201: gnu: python-requests: Update to 2.26.0., (continued)
- 190/201: gnu: python-requests: Update to 2.26.0., guix-commits, 2021/11/01
- 180/201: gnu: network-manager: Update to 1.32.12., guix-commits, 2021/11/01
- 199/201: gnu: libgdata: Use libsoup 2 to fix build., guix-commits, 2021/11/01
- 181/201: gnu: accountsservice: Use meson 0.59.4 to work around a bug in 0.60.0., guix-commits, 2021/11/01
- 60/201: gnu: gstreamer: Update to 1.18.5., guix-commits, 2021/11/01
- 65/201: gnu: gst-libav: Update to 1.18.5., guix-commits, 2021/11/01
- 68/201: gnu: gstreamer-docs: Update to 1.18.5., guix-commits, 2021/11/01
- 85/201: gnu: Add ld-gold-wrapper., guix-commits, 2021/11/01
- 86/201: gnu: gdb: Patch references to /bin/sh and add debug output., guix-commits, 2021/11/01
- 95/201: gnu: Move a few Python packages to (gnu packages python-build)., guix-commits, 2021/11/01
- 100/201: gnu: python-pytest-6: Fix version via setuptools-scm.,
guix-commits <=
- 104/201: build: glib-or-gtk-build-system: Fix indentation., guix-commits, 2021/11/01
- 98/201: gnu: Add python-tomli., guix-commits, 2021/11/01
- 101/201: gnu: python-pathlib2: Update to 2.3.6., guix-commits, 2021/11/01
- 109/201: gnu: json-glib-minimal: Introduce minimal variant., guix-commits, 2021/11/01
- 113/201: gnu: gusb-minimal: Introduce minimal variant., guix-commits, 2021/11/01
- 127/201: gnu: vala: Update to 0.54.2., guix-commits, 2021/11/01
- 116/201: gnu: mesa: Update to 21.2.4., guix-commits, 2021/11/01
- 137/201: build: glib-or-gtk: Generate the gdk-pixbuf-loaders cache file in a phase., guix-commits, 2021/11/01
- 143/201: gnu: elogind: Update to 246.10., guix-commits, 2021/11/01
- 148/201: gnu: jsoncpp: Apply patch to regular package., guix-commits, 2021/11/01