[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
100/142: gnu: python-pytest-6: Fix version via setuptools-scm.
From: |
guix-commits |
Subject: |
100/142: gnu: python-pytest-6: Fix version via setuptools-scm. |
Date: |
Wed, 20 Oct 2021 14:56:51 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 358a3d4d5ec5959e68ebc02b3750bd61864b48a2
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 380eba7..ff6b102 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.
- 42/142: gnu: gst-plugins-good: Update to 1.19.2., (continued)
- 42/142: gnu: gst-plugins-good: Update to 1.19.2., guix-commits, 2021/10/20
- 54/142: gnu: abseil-cpp: Remove googletest patch., guix-commits, 2021/10/20
- 67/142: gnu: python-gst: Update to 1.18.5., guix-commits, 2021/10/20
- 69/142: gnu: tensorflow: Enable parallel build (at least partially)., guix-commits, 2021/10/20
- 68/142: gnu: gstreamer-docs: Update to 1.18.5., guix-commits, 2021/10/20
- 70/142: gnu: python-keras: Enable parallel tests., guix-commits, 2021/10/20
- 66/142: gnu: gst-editing-services: Update to 1.18.5., guix-commits, 2021/10/20
- 76/142: gnu: glibc: Look for the current timezone in /etc/localtime., guix-commits, 2021/10/20
- 78/142: gnu: gtk+-2: Fix ‘builder’ test., guix-commits, 2021/10/20
- 95/142: gnu: Move a few Python packages to (gnu packages python-build)., guix-commits, 2021/10/20
- 100/142: gnu: python-pytest-6: Fix version via setuptools-scm.,
guix-commits <=
- 101/142: gnu: python-pathlib2: Update to 2.3.6., guix-commits, 2021/10/20
- 112/142: gnu: libcloudproviders-minimal: Introduce minimal variant., guix-commits, 2021/10/20
- 113/142: gnu: gusb-minimal: Introduce minimal variant., guix-commits, 2021/10/20
- 126/142: gnu: glib-networking: Update to 2.70.rc., guix-commits, 2021/10/20
- 04/142: gnu: pulseaudio: Update to 14.2., guix-commits, 2021/10/20
- 18/142: gnu: cheese: Propagate gdk-pixbuf+svg rather than gdk-pixbuf., guix-commits, 2021/10/20
- 49/142: gnu: e2fsprogs: Update to 1.46.4., guix-commits, 2021/10/20
- 55/142: gnu: abseil-cpp: Update to 20210324.2., guix-commits, 2021/10/20
- 61/142: gnu: gst-plugins-base: Update to 1.18.5., guix-commits, 2021/10/20
- 96/142: gnu: python-pypa-build: Update to 0.7.0., guix-commits, 2021/10/20