aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars-Dominik Braun <lars@6xq.net>2022-02-15 10:31:24 +0100
committerLars-Dominik Braun <lars@6xq.net>2022-02-15 10:38:36 +0100
commitb5853e08979bcbecbf43f320bb99564a4a656160 (patch)
tree99ce39b5ff888983f900032ece760f15ba231bd0
parent8d472e9314052403ad548f92ca6c10f9c961a087 (diff)
downloadguix-b5853e08979bcbecbf43f320bb99564a4a656160.tar.gz
guix-b5853e08979bcbecbf43f320bb99564a4a656160.zip
gnu: trash-cli: Use pytest for testing.
Running setup.py overwrites the wrappers created by the 'wrap phase. Fixes: <https://issues.guix.gnu.org/53695> * gnu/packages/shellutils.scm (trash-cli)[arguments]: Replace 'check phase with call to pytest.
-rw-r--r--gnu/packages/shellutils.scm9
1 files changed, 8 insertions, 1 deletions
diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 3f9f8a27f4..d0f4068062 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -341,7 +341,14 @@ between various shells or commands.")
(mkdir-p bin)
(substitute* "setup.py"
(("add_script\\('")
- (string-append "add_script('" bin "/" )))))))))
+ (string-append "add_script('" bin "/" ))))))
+ ;; Whenever setup.py is invoked, scripts in out/bin/ are
+ ;; replaced. Thus we cannot invoke setup.py for testing.
+ ;; Upstream also uses pytest.
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "pytest")))))))
(native-inputs
(list python-pytest
python-mock
>2020-10-14doc: cookbook: Mention "#true" and "#false"....Ludovic Courtès 2020-09-09doc: cookbook: Adding a section "Running Guix on a Linode Server"...Joshua Branson 2020-08-23doc: cookbook: Add chapter about Guix environment....Oleg Pykhalov 2020-07-09doc: cookbook: Fix ‘file system’ spelling....Tobias Geerinckx-Rice 2020-06-28doc: cookbook: Fix encoding of "André"....Ludovic Courtès 2020-06-28doc: cookbook: Update entry about getting substitutes through Tor....André Batista 2020-06-23doc: cookbook: Fix typos....Ludovic Courtès 2020-06-23doc: cookbook: Tweak intro to the REPL....Ludovic Courtès 2020-06-23doc: cookbook: Mention "guix hash -rx" for Git checkouts....Ludovic Courtès 2020-06-23doc: cookbook: Clarify 'git-fetch' conventions....Ludovic Courtès 2020-06-04doc: cookbook: Add entry about getting substitutes through Tor....Brice Waegeneire 2020-06-02doc: cookbook: Add entry about Wireguard VPN....Marcin Karpezo 2020-05-25doc: cookbook: Add subsection about session locking with xss-lock....Chris Bøg 2020-05-05doc: cookbook: Fix sbcl-ttf-fonts package name....Jean-Baptiste Note 2020-04-30doc: cookbook: Rename stumpwm package to current state....Marcin Karpezo 2020-04-25doc: cookbook: Fix quotes....Nicolas Goaziou 2020-04-24doc: cookbook: Use @file for file names and extensions....Nicolas Goaziou 2020-04-24doc: cookbook: Fix misuses of double spacing....Nicolas Goaziou 2020-04-22doc: cookbook: Explain how to use bind mounts....Matthew Brooks 2020-03-30gnu: Add sbcl-stumpwm-ttf-fonts....Oleg Pykhalov 2020-01-17doc: cookbook: Avoid URL reference to the manual....Ludovic Courtès 2019-11-26doc: cookbook: Add cross-references to the Guile manual....Ludovic Courtès 2019-11-26doc: cookbook: Use @result{} & co. instead of a '>' prompt....Ludovic Courtès 2019-11-26doc: cookbook: Use Texinfo quotes....Ludovic Courtès 2019-11-26doc: cookbook: Add cross-reference about ./pre-inst-env....Ludovic Courtès 2019-11-26doc: cookbook: Use @lisp for Scheme snippets....Ludovic Courtès 2019-10-30doc: Explain how to switch profile from empty shell in "Profiles in Practice"....Pierre Neidhardt 2019-10-28doc: Link to SICP Info page in "A Scheme Crash Course"....Pierre Neidhardt 2019-10-28doc: Finish importing the "Packaging Tutorial"....Pierre Neidhardt 2019-10-28doc: Fix some typos in "Guix Profiles in Practice"....Pierre Neidhardt 2019-10-25doc: cookbook: Use "@lisp" for Scheme snippets....Ludovic Courtès 2019-10-24doc: Add "Guix Profiles in Practice" to the cookbook....Pierre Neidhardt