[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
100/180: gnu: python-pytest-6: Fix version via setuptools-scm.
From: |
guix-commits |
Subject: |
100/180: gnu: python-pytest-6: Fix version via setuptools-scm. |
Date: |
Fri, 29 Oct 2021 15:56:54 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 785bc204652742cf5f6af4e197f4071d22e55f0e
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.
- 109/180: gnu: json-glib-minimal: Introduce minimal variant., (continued)
- 109/180: gnu: json-glib-minimal: Introduce minimal variant., guix-commits, 2021/10/29
- 114/180: gnu: rest: Use libsoup-minimal., guix-commits, 2021/10/29
- 121/180: gnu: util-linux: Globally disable the lsns test., guix-commits, 2021/10/29
- 135/180: gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper., guix-commits, 2021/10/29
- 137/180: build: glib-or-gtk: Generate the gdk-pixbuf-loaders cache file in a phase., guix-commits, 2021/10/29
- 139/180: gnu: gdk-pixbuf: Add a search path for the loaders cache file., guix-commits, 2021/10/29
- 144/180: gnu: cdparanoia: Disable parallel build., guix-commits, 2021/10/29
- 148/180: gnu: jsoncpp: Apply patch to regular package., guix-commits, 2021/10/29
- 150/180: gnu: curl: Update to 7.79.1., guix-commits, 2021/10/29
- 97/180: gnu: Add python-flit-core., guix-commits, 2021/10/29
- 100/180: gnu: python-pytest-6: Fix version via setuptools-scm.,
guix-commits <=
- 152/180: gnu: python-dbus: Update to 1.2.18., guix-commits, 2021/10/29
- 159/180: gnu: gstreamer: Disable the pipelines-seek test., guix-commits, 2021/10/29
- 162/180: gnu: zxing-cpp: Update to 1.2.0-0.00783db., guix-commits, 2021/10/29
- 166/180: gnu: python2-lit: Remove package., guix-commits, 2021/10/29
- 168/180: gnu: Add cling., guix-commits, 2021/10/29
- 170/180: gnu: gtkmm-3: Update to 3.24.5., guix-commits, 2021/10/29
- 110/180: gnu: Add docbook-xsl-ns., guix-commits, 2021/10/29
- 116/180: gnu: mesa: Update to 21.2.4., guix-commits, 2021/10/29
- 123/180: gnu: pango: Update to 1.48.10., guix-commits, 2021/10/29
- 122/180: gnu: heimdal: Fix build., guix-commits, 2021/10/29