[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
100/203: gnu: python-pytest-6: Fix version via setuptools-scm.
From: |
guix-commits |
Subject: |
100/203: gnu: python-pytest-6: Fix version via setuptools-scm. |
Date: |
Wed, 3 Nov 2021 21:10:11 -0400 (EDT) |
apteryx 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.
- 67/203: gnu: python-gst: Update to 1.18.5., (continued)
- 67/203: gnu: python-gst: Update to 1.18.5., guix-commits, 2021/11/03
- 74/203: gnu: python-keras: Skip a flaky test., guix-commits, 2021/11/03
- 77/203: gnu: tzdata: Update to 2021e., guix-commits, 2021/11/03
- 82/203: gnu: curl: Honor #:tests?., guix-commits, 2021/11/03
- 85/203: gnu: Add ld-gold-wrapper., guix-commits, 2021/11/03
- 83/203: gnu: gcc-5: Fix powerpc64le-linux build, guix-commits, 2021/11/03
- 89/203: aux-files: sitecustomize: Cleanup and add explanatory comments., guix-commits, 2021/11/03
- 93/203: gnu: Build all Rust packages using the latest rustc., guix-commits, 2021/11/03
- 104/203: build: glib-or-gtk-build-system: Fix indentation., guix-commits, 2021/11/03
- 90/203: gnu: glade3: Remove sitecustomize.py workaround., guix-commits, 2021/11/03
- 100/203: gnu: python-pytest-6: Fix version via setuptools-scm.,
guix-commits <=
- 108/203: gnu: lsof: Fix indentation., guix-commits, 2021/11/03
- 101/203: gnu: python-pathlib2: Update to 2.3.6., guix-commits, 2021/11/03
- 99/203: gnu: python-setuptools-scm: Update to 6.3.2, guix-commits, 2021/11/03
- 94/203: gnu: fontconfig: Add a search path for XDG_DATA_DIRS., guix-commits, 2021/11/03
- 122/203: gnu: heimdal: Fix build., guix-commits, 2021/11/03
- 117/203: gnu: graphviz: Update to 2.49.0., guix-commits, 2021/11/03
- 125/203: gnu: glib: Update to 2.70, specify a bindir prefix and hide package., guix-commits, 2021/11/03
- 128/203: gnu: libsoup: Reverse inheritance relationship with libsoup-minimal., guix-commits, 2021/11/03
- 127/203: gnu: vala: Update to 0.54.2., guix-commits, 2021/11/03
- 137/203: build: glib-or-gtk: Generate the gdk-pixbuf-loaders cache file in a phase., guix-commits, 2021/11/03