[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
28/163: gnu: python-cffi: Do not set PYTHONPATH.
From: |
guix-commits |
Subject: |
28/163: gnu: python-cffi: Do not set PYTHONPATH. |
Date: |
Mon, 25 Jan 2021 02:01:21 -0500 (EST) |
apteryx pushed a commit to branch cu/farewell-to-pythonpath
in repository guix.
commit 0dbe5da7451460077719da0ed428ffc476e2861c
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Jan 22 16:52:32 2021 -0500
gnu: python-cffi: Do not set PYTHONPATH.
* gnu/packages/libffi.scm (python-cffi): Remove trailing #t.
[phases]{check}: Do not set PYTHONPATH.
---
gnu/packages/libffi.scm | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm
index 998df6c..0f549bd 100644
--- a/gnu/packages/libffi.scm
+++ b/gnu/packages/libffi.scm
@@ -6,7 +6,7 @@
;;; Copyright © 2016, 2017 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017, 2019, 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2019, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 John Doe <dftxbs3e@free.fr>
;;;
;;; This file is part of GNU Guix.
@@ -128,20 +128,10 @@ conversions for values passed between the two languages.")
`(("pkg-config" ,pkg-config)
("python-pytest" ,python-pytest)))
(arguments
- `(#:modules ((ice-9 ftw)
- (srfi srfi-26)
- (guix build utils)
- (guix build python-build-system))
- #:phases
+ `(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _
- (setenv "PYTHONPATH"
- (string-append
- (getenv "PYTHONPATH")
- ":" (getcwd) "/build/"
- (car (scandir "build" (cut string-prefix? "lib." <>)))))
-
;; XXX The "normal" approach of setting CC and friends does
;; not work here. Is this the correct way of doing things?
(substitute* "testing/embedding/test_basic.py"
@@ -152,8 +142,7 @@ conversions for values passed between the two languages.")
"linker_so='gcc -shared')")))
(substitute* "testing/cffi0/test_ownlib.py"
(("\"cc testownlib") "\"gcc testownlib"))
- (invoke "py.test" "-v" "c/" "testing/")
- #t))
+ (invoke "py.test" "-v" "c/" "testing/")))
(add-before 'check 'patch-paths-of-dynamically-loaded-libraries
(lambda* (#:key inputs #:allow-other-keys)
;; Shared libraries should be referred by their absolute path as
@@ -176,8 +165,7 @@ conversions for values passed between the two languages.")
(format #f "lib_m = ['~a']" libm)))
(substitute* "c/test_c.py"
(("find_and_load_library\\(['\"]{1}c['\"]{1}")
- (format #f "find_and_load_library('~a'" libc)))
- #t))))))
+ (format #f "find_and_load_library('~a'" libc)))))))))
(home-page "https://cffi.readthedocs.io/")
(synopsis "Foreign function interface for Python")
(description "Foreign Function Interface for Python calling C code.")
- 112/163: gnu: gnome-shell: Wrap with the new Guix PYTHONPATH., (continued)
- 112/163: gnu: gnome-shell: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 106/163: gnu: gtg: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 111/163: gnu: caribou: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 80/163: gnu: gtk-doc: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 119/163: gnu: komikku: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 121/163: gnu: python-pathos: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 126/163: gnu: python-hdf4: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 20/163: gnu: gess: Adjust to use Guix PYTHONPATH., guix-commits, 2021/01/25
- 23/163: gnu: find-circ: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 17/163: gnu: bamm: Update following changes to the Python build system., guix-commits, 2021/01/25
- 28/163: gnu: python-cffi: Do not set PYTHONPATH.,
guix-commits <=
- 46/163: gnu: avogadro: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 33/163: gnu: python-pyhamcrest: Update to 2.0.2., guix-commits, 2021/01/25
- 52/163: gnu: ibus: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 70/163: gnu: solfege: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 101/163: gnu: presentty: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 87/163: gnu: python-fenics-dijitso: Do not alter PYTHONPATH., guix-commits, 2021/01/25
- 96/163: gnu: entangle: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 85/163: gnu: units: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 84/163: gnu: glimpse: Use the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 103/163: gnu: python-pytest-isort: Do not set PYTHONPATH., guix-commits, 2021/01/25