guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

100/227: gnu: python-pytest-6: Fix version via setuptools-scm.


From: guix-commits
Subject: 100/227: gnu: python-pytest-6: Fix version via setuptools-scm.
Date: Thu, 11 Nov 2021 12:30:15 -0500 (EST)

apteryx pushed a commit to branch core-updates-frozen
in repository guix.

commit dac3ba0d400dc6fb9c06724e282489ea3dcffc70
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.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]