From 389ae75a37b4238c8efa8577cd860e37e35a961e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Aug 2022 22:23:13 +0200 Subject: gnu: python-lz4: Update to 4.0.2. * gnu/packages/python-compression.scm (python-lz4): Update to 4.0.2. [native-inputs]: Remove PYTHON-NOSE. Add PYTHON-PKGCONFIG and PYTHON-PSUTIL. [arguments]: Override check phase. --- gnu/packages/python-compression.scm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'gnu/packages/python-compression.scm') diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index edfa974a71..12c172c0bc 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2020 Nicolas Goaziou -;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020, 2022 Marius Bakke ;;; Copyright © 2021 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. @@ -230,14 +230,14 @@ Python strings.") (define-public python-lz4 (package (name "python-lz4") - (version "0.10.1") + (version "4.0.2") (source (origin (method url-fetch) (uri (pypi-uri "lz4" version)) (sha256 (base32 - "0ghv1xbaq693kgww1x9c22bplz479ls9szjsaa4ig778ls834hm0")) + "16vj2bnhhdkcz2a2ai2mx2kf9ngx1cjr18636yp1514kq9r72fq8")) (modules '((guix build utils))) (snippet '(begin @@ -245,8 +245,18 @@ Python strings.") (delete-file-recursively "lz4libs") #t)))) (build-system python-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Taken from tox.ini (excludes experimental tests). + (invoke "pytest" "-vv" "tests/block" "tests/frame"))))))) (native-inputs - (list pkg-config python-nose python-setuptools-scm)) + (list pkg-config python-pytest python-pkgconfig python-setuptools-scm + ;; For tests. + python-psutil)) (inputs (list lz4)) (home-page "https://github.com/python-lz4/python-lz4") -- cgit v1.2.3 From 504e06012687dd2ff11af60528e4232fbdeca85e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Aug 2022 02:00:01 +0200 Subject: gnu: python-lzo: Update to 1.14. * gnu/packages/python-compression.scm (python-lzo): Update to 1.14. [arguments]: Don't explicitly return #t from phases. --- gnu/packages/python-compression.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages/python-compression.scm') diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index 12c172c0bc..b3d7925aa5 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -195,14 +195,13 @@ Python.") (define-public python-lzo (package (name "python-lzo") - (version "1.12") + (version "1.14") (source (origin (method url-fetch) (uri (pypi-uri "python-lzo" version)) (sha256 - (base32 - "0iakqgd51n1cd7r3lpdylm2rgbmd16y74cra9kcapwg84mlf9a4p")))) + (base32 "0315nq6r39n51n8qqamb7xv0ib0qrh76q7g3a1977172mbndijw3")))) (build-system python-build-system) (arguments `(#:test-target "check" @@ -215,8 +214,7 @@ Python.") (string-append "include_dirs.append('" (assoc-ref %build-inputs "lzo") "/include/lzo" - "')"))) - #t))))) + "')")))))))) (inputs (list lzo)) (home-page "https://github.com/jd-boyd/python-lzo") -- cgit v1.2.3 From 0337b65284d353b3c4fa05c7f92ac184d4c7d113 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Aug 2022 02:00:00 +0200 Subject: gnu: python-lzo: Use G-expressions. * gnu/packages/python-compression.scm (python-lzo)[arguments]: Rewrite as G-expressions. --- gnu/packages/python-compression.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'gnu/packages/python-compression.scm') diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index b3d7925aa5..0504dd0b2a 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -204,17 +204,18 @@ Python.") (base32 "0315nq6r39n51n8qqamb7xv0ib0qrh76q7g3a1977172mbndijw3")))) (build-system python-build-system) (arguments - `(#:test-target "check" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-setuppy - (lambda _ - (substitute* "setup.py" - (("include_dirs.append\\(.*\\)") - (string-append "include_dirs.append('" - (assoc-ref %build-inputs "lzo") - "/include/lzo" - "')")))))))) + (list + #:test-target "check" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-setuppy + (lambda _ + (substitute* "setup.py" + (("include_dirs.append\\(.*\\)") + (string-append "include_dirs.append('" + #$(this-package-input "lzo") + "/include/lzo" + "')")))))))) (inputs (list lzo)) (home-page "https://github.com/jd-boyd/python-lzo") -- cgit v1.2.3