guix-commits
[Top][All Lists]
Advanced

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

70/242: gnu: python-pytest-shutil: Adjust to use python-path.


From: guix-commits
Subject: 70/242: gnu: python-pytest-shutil: Adjust to use python-path.
Date: Thu, 12 May 2022 14:14:09 -0400 (EDT)

apteryx pushed a commit to branch master
in repository guix.

commit f2be0c5b2b19a4c867906f4ae1b4393d92cc4b08
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Apr 6 15:23:25 2022 -0400

    gnu: python-pytest-shutil: Adjust to use python-path.
    
    * gnu/packages/python-check.scm (python-pytest-shutil)
    [phases]{use-path-instead-of-path.py}: New phase.
    [propagated-inputs]: Replace python-path.py with python-path.
---
 gnu/packages/python-check.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index f44ab0ca9a..5469200afc 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -1080,6 +1080,12 @@ isort.")
     (arguments
      `(#:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'use-path-instead-of-path.py
+           ;; path.py is obsolete.
+           (lambda _
+             (substitute* "setup.py"
+               (("'path.py'")
+                "'path'"))))
          (add-after 'unpack 'patch-tests
            (lambda _
              (mkdir "/tmp/bin")
@@ -1087,11 +1093,9 @@ isort.")
                (("dirname = '/bin'")
                 "dirname = '/tmp/bin'")
                (("bindir = os.path.realpath\\('/bin'\\)")
-                "bindir = os.path.realpath('/tmp/bin')"))
-             #t)))))
+                "bindir = os.path.realpath('/tmp/bin')")))))))
     (propagated-inputs
-     (list python-contextlib2 python-execnet python-pathpy
-           python-termcolor))
+     (list python-contextlib2 python-execnet python-path python-termcolor))
     (native-inputs
      (list python-mock python-pytest python-setuptools-git))
     (home-page "https://github.com/manahl/pytest-plugins";)



reply via email to

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