amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: python-lxml: Update to 4.9.1.

Browse source 
* gnu/packages/xml.scm (python-lxml): Update to 4.9.1.
[source](modules, snippet): Remove.
[arguments]: Respect TESTS? keyword in check phase.
(python-lxml-4.7): Define as deprecated alias for PYTHON-LXML.
* gnu/packages/video.scm (streamlink)[propagated-inputs]: Change from
PYTHON-LXML-4.7 to PYTHON-LXML.
This commit is contained in:
Marius Bakke 2022-09-05 18:04:34 +02:00
parent 44119bf51d
commit 14b8282aa2
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 9 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/video.scm
View file

@ -3092,7 +3092,7 @@ and custom quantization matrices.")
(list python-pysocks (list python-pysocks
python-websocket-client python-websocket-client
python-isodate python-isodate
python-lxml-4.7 python-lxml
python-pycountry python-pycountry
python-pycryptodome python-pycryptodome
python-requests python-requests

30
gnu/packages/xml.scm
View file

@ -82,6 +82,7 @@
#:use-module (guix build-system meson) #:use-module (guix build-system meson)
#:use-module (guix build-system perl) #:use-module (guix build-system perl)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix deprecation)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages pkg-config)) #:use-module (gnu packages pkg-config))
@ -2483,26 +2484,20 @@ because lxml.etree already has its own implementation of XPath 1.0.")
(define-public python-lxml (define-public python-lxml
(package (package
(name "python-lxml") (name "python-lxml")
(version "4.6.3") (version "4.9.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "lxml" version)) (uri (pypi-uri "lxml" version))
(sha256 (sha256
(base32 "0s14r1w2x9sdlcsw8mxiqgw4rz5zs5lpqpxrfyn4a1mkndqqbdrr")) (base32 "0grczyrrq2rbwhvpri15cyhv330s494vbz3js3jky8xp5c2rnx7y"))))
;; Adapt a test to libxml2 2.9.12, taken from this commit:
;; https://github.com/lxml/lxml/commit/852ed1092bd80b6b9a51db24371047e
(modules '((guix build utils)))
(snippet
'(substitute* "src/lxml/tests/test_etree.py"
(("self\\.assertEqual\\(\\{'hha': None\\}, el\\.nsmap\\)")
"self.assertEqual({}, el.nsmap)")))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
(replace 'check (replace 'check
(lambda _ (lambda* (#:key tests? #:allow-other-keys)
(invoke "make" "test")))))) (when tests?
(invoke "make" "test")))))))
(inputs (inputs
(list libxml2 libxslt)) (list libxml2 libxslt))
(home-page "https://lxml.de/") (home-page "https://lxml.de/")
@ -2512,17 +2507,8 @@ because lxml.etree already has its own implementation of XPath 1.0.")
libxml2 and libxslt.") libxml2 and libxslt.")
(license license:bsd-3))) ; and a few more, see LICENSES.txt (license license:bsd-3))) ; and a few more, see LICENSES.txt
(define-public python-lxml-4.7 (define-deprecated python-lxml-4.7 python-lxml)
(package (export python-lxml-4.7)
(inherit python-lxml)
(version "4.7.1")
(source
(origin
(inherit (package-source python-lxml))
(uri (pypi-uri "lxml" version))
(sha256
(base32
"090viyanaki4q7w7i000xl0qh4in52bkl3qal55sz2bbm8w3hqd1"))))))
(define-public python-untangle (define-public python-untangle
;; The latest tagged release is from 2014; use the latest commit. ;; The latest tagged release is from 2014; use the latest commit.