[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
100/130: gnu: python-pytest-6: Fix version via setuptools-scm.
From: |
guix-commits |
Subject: |
100/130: gnu: python-pytest-6: Fix version via setuptools-scm. |
Date: |
Sat, 16 Oct 2021 02:36:41 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit e76ae6ae9f11085c3a3ac6dd18c817585f7d7383
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.
- 75/130: gnu: glibc: Remove unneeded nscd patching., (continued)
- 75/130: gnu: glibc: Remove unneeded nscd patching., guix-commits, 2021/10/16
- 82/130: gnu: curl: Honor #:tests?., guix-commits, 2021/10/16
- 84/130: gnu: make-ld-wrapper: Add a LINKER argument., guix-commits, 2021/10/16
- 81/130: build: qt-utils: Don't wrap .X-real files., guix-commits, 2021/10/16
- 90/130: gnu: glade3: Remove sitecustomize.py workaround., guix-commits, 2021/10/16
- 89/130: aux-files: sitecustomize: Cleanup and add explanatory comments., guix-commits, 2021/10/16
- 87/130: gnu: gdb: Normalize indentation., guix-commits, 2021/10/16
- 97/130: gnu: Add python-flit-core., guix-commits, 2021/10/16
- 96/130: gnu: python-pypa-build: Update to 0.7.0., guix-commits, 2021/10/16
- 101/130: gnu: python-pathlib2: Update to 2.3.6., guix-commits, 2021/10/16
- 100/130: gnu: python-pytest-6: Fix version via setuptools-scm.,
guix-commits <=
- 103/130: build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase., guix-commits, 2021/10/16
- 109/130: gnu: libcloudproviders-minimal: Introduce minimal variant., guix-commits, 2021/10/16
- 112/130: gnu: inkscape: Remove the legacy 0.92 version., guix-commits, 2021/10/16
- 111/130: gnu: rest: Use libsoup-minimal., guix-commits, 2021/10/16
- 119/130: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/10/16
- 122/130: build: glib-or-gtk: Generate the gdk-pixbuf-loaders cache file in a phase., guix-commits, 2021/10/16
- 117/130: gnu: cmake-bootstrap: Update to 3.21.3., guix-commits, 2021/10/16
- 26/130: gnu: gst-plugins-bad: Add missing inputs to enable more features., guix-commits, 2021/10/16
- 48/130: gnu: python-gst: Update to 1.19.2., guix-commits, 2021/10/16
- 51/130: gnu: pulseaudio: Update to 15.0., guix-commits, 2021/10/16