[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
100/140: gnu: python-pytest-6: Fix version via setuptools-scm.
From: |
guix-commits |
Subject: |
100/140: gnu: python-pytest-6: Fix version via setuptools-scm. |
Date: |
Sun, 17 Oct 2021 23:11:06 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit c6b6d3ccd4355e9db3c7c3c44fe36db2b7fe3319
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.
- 84/140: gnu: make-ld-wrapper: Add a LINKER argument., (continued)
- 84/140: gnu: make-ld-wrapper: Add a LINKER argument., guix-commits, 2021/10/17
- 88/140: guix: packages: Fix repacking of plain tarballs., guix-commits, 2021/10/17
- 89/140: aux-files: sitecustomize: Cleanup and add explanatory comments., guix-commits, 2021/10/17
- 90/140: gnu: glade3: Remove sitecustomize.py workaround., guix-commits, 2021/10/17
- 97/140: gnu: Add python-flit-core., guix-commits, 2021/10/17
- 95/140: gnu: Move a few Python packages to (gnu packages python-build)., guix-commits, 2021/10/17
- 92/140: gnu: rust: Add rust 1.54 and move all non-bootstrapping logic to it., guix-commits, 2021/10/17
- 87/140: gnu: gdb: Normalize indentation., guix-commits, 2021/10/17
- 93/140: gnu: Build all Rust packages using the latest rustc., guix-commits, 2021/10/17
- 98/140: gnu: Add python-tomli., guix-commits, 2021/10/17
- 100/140: gnu: python-pytest-6: Fix version via setuptools-scm.,
guix-commits <=
- 102/140: gnu: meson: Patch to allow installing to independent prefixes., guix-commits, 2021/10/17
- 104/140: build: glib-or-gtk-build-system: Fix indentation., guix-commits, 2021/10/17
- 105/140: gnu: at-spi2-core: Reverse inheritance relationship with minimal variant., guix-commits, 2021/10/17
- 107/140: gnu: lsof: Disable the LTlock test., guix-commits, 2021/10/17
- 108/140: gnu: lsof: Fix indentation., guix-commits, 2021/10/17
- 116/140: gnu: mesa: Update to 21.2.4., guix-commits, 2021/10/17
- 114/140: gnu: rest: Use libsoup-minimal., guix-commits, 2021/10/17
- 115/140: gnu: inkscape: Remove the legacy 0.92 version., guix-commits, 2021/10/17
- 117/140: gnu: graphviz: Update to 2.49.0., guix-commits, 2021/10/17
- 120/140: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/10/17