[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
101/115: gnu: python-pytest-6: Fix version via setuptools-scm.
From: |
guix-commits |
Subject: |
101/115: gnu: python-pytest-6: Fix version via setuptools-scm. |
Date: |
Fri, 15 Oct 2021 09:49:19 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 9e6eb9d76f18fecec16b8f3cb63c87a5900157a2
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 238a855..38d2ce3 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.
- 81/115: gnu: glib: Skip ‘testfilemonitor’ test., (continued)
- 81/115: gnu: glib: Skip ‘testfilemonitor’ test., guix-commits, 2021/10/15
- 86/115: gnu: Add ld-gold-wrapper., guix-commits, 2021/10/15
- 87/115: gnu: gdb: Patch references to /bin/sh and add debug output., guix-commits, 2021/10/15
- 88/115: gnu: gdb: Normalize indentation., guix-commits, 2021/10/15
- 92/115: gnu: rust: Bootstrap rust from 1.39.0 and optimize build time., guix-commits, 2021/10/15
- 72/115: gnu: libnice: Update to 0.1.18-0.47a9633., guix-commits, 2021/10/15
- 85/115: gnu: make-ld-wrapper: Add a LINKER argument., guix-commits, 2021/10/15
- 102/115: gnu: python-pathlib2: Update to 2.3.6., guix-commits, 2021/10/15
- 108/115: gnu: inkscape: Remove the legacy 0.92 version., guix-commits, 2021/10/15
- 100/115: gnu: python-setuptools-scm: Update to 6.3.2, guix-commits, 2021/10/15
- 101/115: gnu: python-pytest-6: Fix version via setuptools-scm.,
guix-commits <=
- 105/115: build: glib-or-gtk-build-system: Fix indentation., guix-commits, 2021/10/15
- 107/115: gnu: at-spi2-atk: Break a dependency cycle between GTK+ and Inkscape., guix-commits, 2021/10/15
- 109/115: gnu: mesa: Update to 21.2.4., guix-commits, 2021/10/15
- 110/115: gnu: graphviz: Update to 2.49.0., guix-commits, 2021/10/15
- 115/115: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/10/15
- 66/115: gnu: gst-editing-services: Update to 1.18.5., guix-commits, 2021/10/15
- 68/115: gnu: gstreamer-docs: Update to 1.18.5., guix-commits, 2021/10/15
- 76/115: gnu: glibc: Look for the current timezone in /etc/localtime., guix-commits, 2021/10/15
- 82/115: build: qt-utils: Don't wrap .X-real files., guix-commits, 2021/10/15
- 89/115: guix: packages: Fix repacking of plain tarballs., guix-commits, 2021/10/15