From: Marius Bakke Date: Wed, 15 Jan 2020 19:19:26 +0000 (+0100) Subject: gnu: python-lxml: Move to (gnu packages xml). X-Git-Url: https://git.hcoop.net/jackhill/guix/guix.git/commitdiff_plain/55e1475cb58c1b9535b35f8bdb157b1435c54755 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. --- diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 7e7bc5d002..f0551d8269 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -36,7 +36,8 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages sphinx) - #:use-module (gnu packages time)) + #:use-module (gnu packages time) + #:use-module (gnu packages xml)) (define-public python-django (package diff --git a/gnu/packages/drones.scm b/gnu/packages/drones.scm index 18b2621e4a..1bc096293e 100644 --- a/gnu/packages/drones.scm +++ b/gnu/packages/drones.scm @@ -23,6 +23,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages xml) #:use-module (guix download) #:use-module (guix utils) #:use-module (guix git-download) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 038031b800..93474dbdbf 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -75,7 +75,6 @@ #:use-module (gnu packages perl-compression) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) - #:use-module (gnu packages python-xyz) #:use-module (gnu packages rdf) #:use-module (gnu packages scanner) #:use-module (gnu packages tls) diff --git a/gnu/packages/nutrition.scm b/gnu/packages/nutrition.scm index 0e5533433e..bae166de3f 100644 --- a/gnu/packages/nutrition.scm +++ b/gnu/packages/nutrition.scm @@ -29,7 +29,8 @@ #:use-module (gnu packages glib) #:use-module (gnu packages image) #: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 (package diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index c976d8aafb..0d87691cd7 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -33,6 +33,7 @@ #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) + #:use-module (gnu packages xml) #:use-module (guix build-system python) #:use-module (guix download) #:use-module ((guix licenses) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 671dcd1563..8e67779e95 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -51,6 +51,7 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages pkg-config) #:use-module (gnu packages xiph) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) (define-public libsndfile diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 4a262ec793..b4241362ba 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -37,6 +37,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages sphinx) #:use-module (gnu packages time) + #:use-module (gnu packages xml) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1f8b936a12..479466cc81 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5784,35 +5784,6 @@ the GObject Introspection bindings to libnotify for non-GTK applications.") (define-public python2-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, ;; and pypi seems to put it under its own name, so I guess we should too (define-public python-beautifulsoup4 diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm index 31a2d481e5..a2952f2b80 100644 --- a/gnu/packages/tryton.scm +++ b/gnu/packages/tryton.scm @@ -27,6 +27,7 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages time) + #:use-module (gnu packages xml) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system python)) diff --git a/gnu/packages/wireservice.scm b/gnu/packages/wireservice.scm index 362b69575f..eab76970f4 100644 --- a/gnu/packages/wireservice.scm +++ b/gnu/packages/wireservice.scm @@ -28,7 +28,8 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #: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. (define-syntax-rule (wireservice-package extra-fields ...) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 7259efb0f7..73ee26ed10 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -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.") (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 (package (name "python-xmltodict")