[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/14: gnu: python-magic: Update to 0.4.22.
From: |
guix-commits |
Subject: |
12/14: gnu: python-magic: Update to 0.4.22. |
Date: |
Sat, 12 Jun 2021 19:05:09 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 425df5b081eed7d2a0eadf1bf968af201714b613
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat May 22 21:51:19 2021 +0200
gnu: python-magic: Update to 0.4.22.
* gnu/packages/python-xyz.scm (python-magic): Update to 0.4.22.
[source]: Switch to GIT-FETCH.
[arguments]: Remove #:tests?. Adjust substitution and override check phase.
Remove obsolete phase.
[native-inputs]: Add WHICH.
---
gnu/packages/python-xyz.scm | 54 +++++++++++++++++----------------------------
1 file changed, 20 insertions(+), 34 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f95a24d..56c2732 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13690,31 +13690,19 @@ is made as zipfile like as possible.")
(define-public python-magic
(package
(name "python-magic")
- (version "0.4.15")
+ (version "0.4.22")
+ (home-page "https://github.com/ahupp/python-magic")
(source
(origin
- (method url-fetch)
- (uri (pypi-uri "python-magic" version))
+ (method git-fetch)
+ (uri (git-reference (url home-page) (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "1mgwig9pnzgkf86q9ji9pnc99bngms15lfszq5rgqb9db07mqxpk"))
- (file-name (string-append name "-" version "-checkout"))))
+ "0zbdjr5shijs0jayz7gycpx0kn6v2bh83dpanyajk2vmy47jvbd6"))))
(build-system python-build-system)
(arguments
- ;; The tests are unreliable, so don't run them. The tests fail
- ;; under Python3 because they were written for Python2 and
- ;; contain import statements that do not work in Python3. One of
- ;; the tests fails under Python2 because its assertions are
- ;; overly stringent; it relies on comparing output strings which
- ;; are brittle and can change depending on the version of
- ;; libmagic being used and the system on which the test is
- ;; running. In my case, under GuixSD 0.10.0, only one test
- ;; failed, and it seems to have failed only because the version
- ;; of libmagic that is packaged in Guix outputs a slightly
- ;; different (but not wrong) string than the one that the test
- ;; expected.
- '(#:tests? #f
- #:phases (modify-phases %standard-phases
+ '(#:phases (modify-phases %standard-phases
;; Replace a specific method call with a hard-coded
;; path to the necessary libmagic.so file in the
;; store. If we don't do this, then the method call
@@ -13724,24 +13712,22 @@ is made as zipfile like as possible.")
(add-before 'build 'hard-code-path-to-libmagic
(lambda* (#:key inputs #:allow-other-keys)
(let ((file (assoc-ref inputs "file")))
- (substitute* "magic.py"
- (("ctypes.util.find_library\\('magic'\\)")
- (string-append "'" file "/lib/libmagic.so'")))
- #t)))
- (add-before 'install 'disable-egg-compression
- (lambda _
- (let ((port (open-file "setup.cfg" "a")))
- (display "\n[easy_install]\nzip_ok = 0\n"
- port)
- (close-port port)
- #t))))))
+ (substitute* "magic/loader.py"
+ (("ctypes\\.util\\.find_library\\('magic'\\)")
+ (string-append "'" file "/lib/libmagic.so'"))))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ ;; The test suite mandates this variable.
+ (setenv "LC_ALL" "en_US.UTF-8")
+ (if tests?
+ (invoke "python" "./test/test.py")
+ (format #t "test suite not run~%")))))))
+ (native-inputs
+ `(("which" ,which)))
(inputs
;; python-magic needs to be able to find libmagic.so.
`(("file" ,file)))
- (home-page
- "https://github.com/ahupp/python-magic")
- (synopsis
- "File type identification using libmagic")
+ (synopsis "File type identification using libmagic")
(description
"This module uses ctypes to access the libmagic file type
identification library. It makes use of the local magic database and
- 03/14: gnu: libx11: Update to 1.7.1., (continued)
- 03/14: gnu: libx11: Update to 1.7.1., guix-commits, 2021/06/12
- 04/14: gnu: expat: Remove replacement., guix-commits, 2021/06/12
- 06/14: gnu: GCC: Switch to GCC 10., guix-commits, 2021/06/12
- 08/14: gnu: graphviz: Update to 2.47.1., guix-commits, 2021/06/12
- 05/14: gnu: curl: Absorb replacement., guix-commits, 2021/06/12
- 10/14: gnu: pango: Update to 1.48.4., guix-commits, 2021/06/12
- 11/14: gnu: poppler: Update to 21.05.0., guix-commits, 2021/06/12
- 07/14: gnu: python-attrs: Update to 21.2.0., guix-commits, 2021/06/12
- 09/14: gnu: harfbuzz: Update to 2.8.1., guix-commits, 2021/06/12
- 13/14: gnu: glib: Add "static" output., guix-commits, 2021/06/12
- 12/14: gnu: python-magic: Update to 0.4.22.,
guix-commits <=
- 14/14: gnu: expat: Install the static library., guix-commits, 2021/06/12