[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
100/217: gnu: python-pytest-6: Fix version via setuptools-scm.
From: |
guix-commits |
Subject: |
100/217: gnu: python-pytest-6: Fix version via setuptools-scm. |
Date: |
Sun, 14 Nov 2021 19:20:53 -0500 (EST) |
vagrantc pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 824485bc4d5a84c11fd7970e510f22c609965efa
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.
- 164/217: gnu: gdb: Update to 11.1 and remove gdb-9.2., (continued)
- 164/217: gnu: gdb: Update to 11.1 and remove gdb-9.2., guix-commits, 2021/11/14
- 162/217: gnu: zxing-cpp: Update to 1.2.0-0.00783db., guix-commits, 2021/11/14
- 160/217: gnu: mesa: Replace obsolete vulkan-overlay-layer build option., guix-commits, 2021/11/14
- 166/217: gnu: python2-lit: Remove package., guix-commits, 2021/11/14
- 172/217: gnu: dconf: Update to 0.40.0., guix-commits, 2021/11/14
- 179/217: gnu: Add polkit-duktape., guix-commits, 2021/11/14
- 190/217: gnu: python-requests: Update to 2.26.0., guix-commits, 2021/11/14
- 89/217: aux-files: sitecustomize: Cleanup and add explanatory comments., guix-commits, 2021/11/14
- 88/217: guix: packages: Fix repacking of plain tarballs., guix-commits, 2021/11/14
- 87/217: gnu: gdb: Normalize indentation., guix-commits, 2021/11/14
- 100/217: gnu: python-pytest-6: Fix version via setuptools-scm.,
guix-commits <=
- 106/217: gnu: at-spi2-atk: Break a dependency cycle between GTK+ and Inkscape., guix-commits, 2021/11/14
- 112/217: gnu: libcloudproviders-minimal: Introduce minimal variant., guix-commits, 2021/11/14
- 120/217: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/11/14
- 138/217: profiles: Add a gdk-pixbuf-loaders-cache-file hook., guix-commits, 2021/11/14
- 143/217: gnu: elogind: Update to 246.10., guix-commits, 2021/11/14
- 152/217: gnu: python-dbus: Update to 1.2.18., guix-commits, 2021/11/14
- 167/217: gnu: python-lit: Update to 12.0.1., guix-commits, 2021/11/14
- 169/217: gnu: Add meson-0.59., guix-commits, 2021/11/14
- 171/217: gnu: gtkmm: Update to 4.4.0., guix-commits, 2021/11/14
- 189/217: gnu: Remove references to a removed patch., guix-commits, 2021/11/14