[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
100/136: gnu: python-pytest-6: Fix version via setuptools-scm.
From: |
guix-commits |
Subject: |
100/136: gnu: python-pytest-6: Fix version via setuptools-scm. |
Date: |
Sun, 17 Oct 2021 05:16:16 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit d41dc3cd1769f025c9fa9940072ada867cc23475
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.
- 133/136: build: glib-or-gtk: Generate the gdk-pixbuf-loaders cache file in a phase., (continued)
- 133/136: build: glib-or-gtk: Generate the gdk-pixbuf-loaders cache file in a phase., guix-commits, 2021/10/17
- 134/136: profiles: Add a gdk-pixbuf-loaders-cache-file hook., guix-commits, 2021/10/17
- 37/136: gnu: python-sphinxcontrib-serializinghtml: Update to 1.1.5., guix-commits, 2021/10/17
- 53/136: gnu: googletest: Update to 1.11.0., guix-commits, 2021/10/17
- 56/136: gnu: mozjs-78: Update to 78.13.0., guix-commits, 2021/10/17
- 61/136: gnu: gst-plugins-base: Update to 1.18.5., guix-commits, 2021/10/17
- 69/136: gnu: tensorflow: Enable parallel build (at least partially)., guix-commits, 2021/10/17
- 90/136: gnu: glade3: Remove sitecustomize.py workaround., guix-commits, 2021/10/17
- 93/136: gnu: Build all Rust packages using the latest rustc., guix-commits, 2021/10/17
- 96/136: gnu: python-pypa-build: Update to 0.7.0., guix-commits, 2021/10/17
- 100/136: gnu: python-pytest-6: Fix version via setuptools-scm.,
guix-commits <=
- 99/136: gnu: python-setuptools-scm: Update to 6.3.2, guix-commits, 2021/10/17
- 115/136: gnu: inkscape: Remove the legacy 0.92 version., guix-commits, 2021/10/17
- 105/136: gnu: at-spi2-core: Reverse inheritance relationship with minimal variant., guix-commits, 2021/10/17
- 116/136: gnu: mesa: Update to 21.2.4., guix-commits, 2021/10/17
- 126/136: gnu: glib-networking: Update to 2.70.rc., guix-commits, 2021/10/17
- 136/136: gnu: gtk: Deprecate gdk-pixbuf+svg in favor of librsvg., guix-commits, 2021/10/17
- 36/136: gnu: python-sphinxcontrib-htmlhelp: Update to 2.0.0., guix-commits, 2021/10/17
- 101/136: gnu: python-pathlib2: Update to 2.3.6., guix-commits, 2021/10/17
- 114/136: gnu: rest: Use libsoup-minimal., guix-commits, 2021/10/17
- 104/136: build: glib-or-gtk-build-system: Fix indentation., guix-commits, 2021/10/17