gnu: python-lxml: Move to (gnu packages xml).

* gnu/packages/python-xyz.scm (python-lxml): Move from here ...
* gnu/packages/xml.scm (python-lxml): ... to here.
* gnu/packages/django.scm, gnu/packages/drones.scm,
gnu/packages/libreoffice.scm, gnu/packages/nutrition.scm,
gnu/packages/openstack.scm, gnu/packages/pulseaudio.scm,
gnu/packages/python-science.scm, gnu/packages/tryton.scm,
gnu/packages/wireservice.scm: Adjust module imports.
This commit is contained in:
Marius Bakke 2020-01-15 20:19:26 +01:00
parent b2205ae4f6
commit 55e1475cb5
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
11 changed files with 40 additions and 33 deletions

View file

@ -36,7 +36,8 @@
#:use-module (gnu packages python-web) #:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
#:use-module (gnu packages time)) #:use-module (gnu packages time)
#:use-module (gnu packages xml))
(define-public python-django (define-public python-django
(package (package

View file

@ -23,6 +23,7 @@
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages xml)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix git-download) #:use-module (guix git-download)

View file

@ -75,7 +75,6 @@
#:use-module (gnu packages perl-compression) #:use-module (gnu packages perl-compression)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages rdf) #:use-module (gnu packages rdf)
#:use-module (gnu packages scanner) #:use-module (gnu packages scanner)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)

View file

@ -29,7 +29,8 @@
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages xml))
(define-public gourmet (define-public gourmet
(package (package

View file

@ -33,6 +33,7 @@
#:use-module (gnu packages time) #:use-module (gnu packages time)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
#:use-module (gnu packages xml)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix download) #:use-module (guix download)
#:use-module ((guix licenses) #:use-module ((guix licenses)

View file

@ -51,6 +51,7 @@
#:use-module (gnu packages python-web) #:use-module (gnu packages python-web)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages xiph) #:use-module (gnu packages xiph)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)) #:use-module (gnu packages xorg))
(define-public libsndfile (define-public libsndfile

View file

@ -37,6 +37,7 @@
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
#:use-module (gnu packages time) #:use-module (gnu packages time)
#:use-module (gnu packages xml)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix utils) #:use-module (guix utils)

View file

@ -5784,35 +5784,6 @@ the GObject Introspection bindings to libnotify for non-GTK applications.")
(define-public python2-notify2 (define-public python2-notify2
(package-with-python2 python-notify2)) (package-with-python2 python-notify2))
(define-public python-lxml
(package
(name "python-lxml")
(version "4.4.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "lxml" version))
(sha256
(base32 "01nvb5j8vs9nk4z5s3250b1m22b4d08kffa36if3g1mdygdrvxpg"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(replace 'check
(lambda _
(invoke "make" "test"))))))
(inputs
`(("libxml2" ,libxml2)
("libxslt" ,libxslt)))
(home-page "https://lxml.de/")
(synopsis "Python XML processing library")
(description
"The lxml XML toolkit is a Pythonic binding for the C libraries
libxml2 and libxslt.")
(license license:bsd-3))) ; and a few more, see LICENSES.txt
(define-public python2-lxml
(package-with-python2 python-lxml))
;; beautifulsoup4 has a totally different namespace than 3.x, ;; beautifulsoup4 has a totally different namespace than 3.x,
;; and pypi seems to put it under its own name, so I guess we should too ;; and pypi seems to put it under its own name, so I guess we should too
(define-public python-beautifulsoup4 (define-public python-beautifulsoup4

View file

@ -27,6 +27,7 @@
#:use-module (gnu packages python-web) #:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages time) #:use-module (gnu packages time)
#:use-module (gnu packages xml)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system python)) #:use-module (guix build-system python))

View file

@ -28,7 +28,8 @@
#:use-module (gnu packages python-web) #:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
#:use-module (gnu packages time)) #:use-module (gnu packages time)
#:use-module (gnu packages xml))
;; Common package definition for packages from https://github.com/wireservice. ;; Common package definition for packages from https://github.com/wireservice.
(define-syntax-rule (wireservice-package extra-fields ...) (define-syntax-rule (wireservice-package extra-fields ...)

View file

@ -2076,6 +2076,35 @@ For lxml.etree this package can be useful for providing XPath 2.0 selectors,
because lxml.etree already has it's own implementation of XPath 1.0.") because lxml.etree already has it's own implementation of XPath 1.0.")
(license license:expat))) (license license:expat)))
(define-public python-lxml
(package
(name "python-lxml")
(version "4.4.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "lxml" version))
(sha256
(base32 "01nvb5j8vs9nk4z5s3250b1m22b4d08kffa36if3g1mdygdrvxpg"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(replace 'check
(lambda _
(invoke "make" "test"))))))
(inputs
`(("libxml2" ,libxml2)
("libxslt" ,libxslt)))
(home-page "https://lxml.de/")
(synopsis "Python XML processing library")
(description
"The lxml XML toolkit is a Pythonic binding for the C libraries
libxml2 and libxslt.")
(license license:bsd-3))) ; and a few more, see LICENSES.txt
(define-public python2-lxml
(package-with-python2 python-lxml))
(define-public python-xmltodict (define-public python-xmltodict
(package (package
(name "python-xmltodict") (name "python-xmltodict")