[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
100/227: gnu: python-pytest-6: Fix version via setuptools-scm.
From: |
guix-commits |
Subject: |
100/227: gnu: python-pytest-6: Fix version via setuptools-scm. |
Date: |
Thu, 11 Nov 2021 12:30:15 -0500 (EST) |
apteryx pushed a commit to branch core-updates-frozen
in repository guix.
commit dac3ba0d400dc6fb9c06724e282489ea3dcffc70
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.
- 83/227: gnu: gcc-5: Fix powerpc64le-linux build, (continued)
- 83/227: gnu: gcc-5: Fix powerpc64le-linux build, guix-commits, 2021/11/11
- 86/227: gnu: gdb: Patch references to /bin/sh and add debug output., guix-commits, 2021/11/11
- 87/227: gnu: gdb: Normalize indentation., guix-commits, 2021/11/11
- 88/227: guix: packages: Fix repacking of plain tarballs., guix-commits, 2021/11/11
- 90/227: gnu: glade3: Remove sitecustomize.py workaround., guix-commits, 2021/11/11
- 91/227: gnu: rust: Bootstrap rust from 1.39.0 and optimize build time., guix-commits, 2021/11/11
- 92/227: gnu: rust: Add rust 1.54 and move all non-bootstrapping logic to it., guix-commits, 2021/11/11
- 94/227: gnu: fontconfig: Add a search path for XDG_DATA_DIRS., guix-commits, 2021/11/11
- 95/227: gnu: Move a few Python packages to (gnu packages python-build)., guix-commits, 2021/11/11
- 96/227: gnu: python-pypa-build: Update to 0.7.0., guix-commits, 2021/11/11
- 100/227: gnu: python-pytest-6: Fix version via setuptools-scm.,
guix-commits <=
- 97/227: gnu: Add python-flit-core., guix-commits, 2021/11/11
- 102/227: gnu: meson: Patch to allow installing to independent prefixes., guix-commits, 2021/11/11
- 104/227: build: glib-or-gtk-build-system: Fix indentation., guix-commits, 2021/11/11
- 108/227: gnu: lsof: Fix indentation., guix-commits, 2021/11/11
- 110/227: gnu: Add docbook-xsl-ns., guix-commits, 2021/11/11
- 111/227: gnu: colord-minimal: Introduce minimal variant., guix-commits, 2021/11/11
- 113/227: gnu: gusb-minimal: Introduce minimal variant., guix-commits, 2021/11/11
- 121/227: gnu: util-linux: Globally disable the lsns test., guix-commits, 2021/11/11
- 131/227: gnu: pulseaudio: Add doxygen to fix build., guix-commits, 2021/11/11
- 134/227: gnu: llvm: Add make-lld-wrapper, lld-wrapper and lld-as-ld-wrapper., guix-commits, 2021/11/11