[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
93/131: gnu: python-cheetah: Do not set PYTHONPATH.
From: |
guix-commits |
Subject: |
93/131: gnu: python-cheetah: Do not set PYTHONPATH. |
Date: |
Mon, 1 Feb 2021 11:56:58 -0500 (EST) |
apteryx pushed a commit to branch core-updates
in repository guix.
commit ce9253b38cf38c8054be843b26571ab5297aebd6
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Jan 24 10:04:34 2021 -0500
gnu: python-cheetah: Do not set PYTHONPATH.
* gnu/packages/python-xyz.scm (python-cheetah)
[arguments]: Remove the '#:modules' argument.
[phases]: Delete trailing #t.
{check}: Do not set PATH nor PYTHONPATH.
---
gnu/packages/python-xyz.scm | 36 +++++++++---------------------------
1 file changed, 9 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 5e9ced0..6b31634 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14490,43 +14490,25 @@ possible on all supported Python versions.")
"0ar5dqjnqaw0c17mymd6xgd81jn9br9fblawr0x438v1571bkaya"))))
(build-system python-build-system)
(arguments
- `(#:modules ((guix build utils)
- (guix build python-build-system)
- (ice-9 ftw)
- (srfi srfi-1)
- (srfi srfi-26))
- #:phases (modify-phases %standard-phases
+ `(#:phases (modify-phases %standard-phases
(add-after 'unpack 'use-absolute-python
(lambda _
(substitute* "Cheetah/CheetahWrapper.py"
(("#!/usr/bin/env python")
- (string-append "#!" (which "python"))))
- #t))
+ (string-append "#!" (which "python"))))))
(add-after 'unpack 'fix-tests
(lambda _
(substitute* "Cheetah/Tests/ImportHooks.py"
(("os.path.dirname\\(__file__\\)")
- (string-append "'" (getcwd) "/Cheetah/Tests'")))
- #t))
+ (string-append "'" (getcwd) "/Cheetah/Tests'")))))
(replace 'check
(lambda _
- (let ((cwd (getcwd)))
- (setenv "PYTHONPATH"
- (string-append
- cwd "/build/"
- (find (cut string-prefix? "lib" <>)
- (scandir (string-append cwd "/build")))
- ":" (getenv "PYTHONPATH")))
- (setenv "PATH"
- (string-append (getenv "PATH")
- ":" cwd "/bin"))
- (setenv "TMPDIR" "/tmp")
-
- (substitute* "Cheetah/Tests/Test.py"
- (("unittest.TextTestRunner\\(\\)")
- "unittest.TextTestRunner(verbosity=2)"))
-
- (invoke "python" "Cheetah/Tests/Test.py")))))))
+ (setenv "TMPDIR" "/tmp")
+ (substitute* "Cheetah/Tests/Test.py"
+ (("unittest.TextTestRunner\\(\\)")
+ "unittest.TextTestRunner(verbosity=2)"))
+
+ (invoke "python" "Cheetah/Tests/Test.py"))))))
(propagated-inputs
`(("python-markdown" ,python-markdown))) ;optional
(home-page "https://cheetahtemplate.org/")
- 86/131: gnu: python-gevent: Do not set PYTHONPATH., (continued)
- 86/131: gnu: python-gevent: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 94/131: gnu: python-pbkdf2: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 99/131: gnu: python-aiohttp: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 107/131: gnu: python-webassets: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 111/131: gnu: redshift: Wrap with GUIX_PYTHONPATH., guix-commits, 2021/02/01
- 101/131: gnu: python-aws-xray-sdk: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 35/131: gnu: python-pyhamcrest: Update to 2.0.2., guix-commits, 2021/02/01
- 84/131: gnu: python-moto: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 92/131: gnu: python-pyelftools: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 91/131: gnu: python-validictory: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 93/131: gnu: python-cheetah: Do not set PYTHONPATH.,
guix-commits <=
- 98/131: gnu: python2-send2trash: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 100/131: gnu: python-asgiref: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 102/131: gnu: python-cfn-lint: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 112/131: gnu: Adjust package collection to Wrap using GUIX_PYTHONPATH., guix-commits, 2021/02/01
- 110/131: gnu: 389-ds-base: Wrap with GUIX_PYTHONPATH., guix-commits, 2021/02/01
- 106/131: gnu: python-flask-wtf: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 113/131: gnu: enjarify: Do not alter PYTHONPATH., guix-commits, 2021/02/01
- 123/131: gnu: roguebox-adventures: Wrap with GUIX_PYTHONPATH., guix-commits, 2021/02/01
- 122/131: gnu: avogadro: Wrap with GUIX_PYTHONPATH., guix-commits, 2021/02/01
- 117/131: gnu: gajim: Use GUIX_PYTHONPATH in search path., guix-commits, 2021/02/01