From a72a18920bcd25fd270b18e601a7e3f7fc9822b0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jan 2020 23:27:42 +0100 Subject: gnu: python-packaging: Update to 20.0. * gnu/packages/python-xyz.scm (python-packaging): Update to 20.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2c308796e7..0f5e564a0c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13050,14 +13050,14 @@ (define-public python2-translate-toolkit (define-public python-packaging (package (name "python-packaging") - (version "19.2") + (version "20.0") (source (origin (method url-fetch) (uri (pypi-uri "packaging" version)) (sha256 (base32 - "0izwlz9h0bw171a1chr311g2y7n657zjaf4mq4rgm8pp9lbj9f98")))) + "1y2ip3a4ykkpgnwgn85j6hkspcl0cg3mzms97f40mk57vwqq67gy")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 28ac442b0e3853605ce47ebc332b1d9fe97ce0d4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jan 2020 23:28:26 +0100 Subject: gnu: python-wcwidth: Adjust indentation. * gnu/packages/python-xyz.scm (python-wcwidth): Re-indent. --- gnu/packages/python-xyz.scm | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0f5e564a0c..a4f36c42cf 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10289,25 +10289,24 @@ (define-public python2-pykafka (package-with-python2 python-pykafka)) (define-public python-wcwidth - (package - (name "python-wcwidth") - (version "0.1.7") - (source - (origin - (method url-fetch) - (uri (pypi-uri "wcwidth" version)) - (sha256 - (base32 - "0pn6dflzm609m4r3i8ik5ni9ijjbb5fa3vg1n7hn6vkd49r77wrx")))) - (build-system python-build-system) - (home-page "https://github.com/jquast/wcwidth") - (synopsis "Measure number of terminal column cells of wide-character codes") - (description "Wcwidth measures the number of terminal column cells of + (package + (name "python-wcwidth") + (version "0.1.7") + (source (origin + (method url-fetch) + (uri (pypi-uri "wcwidth" version)) + (sha256 + (base32 + "0pn6dflzm609m4r3i8ik5ni9ijjbb5fa3vg1n7hn6vkd49r77wrx")))) + (build-system python-build-system) + (home-page "https://github.com/jquast/wcwidth") + (synopsis "Measure number of terminal column cells of wide-character codes") + (description "Wcwidth measures the number of terminal column cells of wide-character codes. It is useful for those implementing a terminal emulator, or programs that carefully produce output to be interpreted by one. It is a Python implementation of the @code{wcwidth} and @code{wcswidth} C functions specified in POSIX.1-2001 and POSIX.1-2008.") - (license license:expat))) + (license license:expat))) (define-public python2-wcwidth (package-with-python2 python-wcwidth)) -- cgit v1.2.3 From 574a71a7a9668aa184661c58e1f18a4d4fccd792 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jan 2020 23:29:34 +0100 Subject: gnu: python-wcwidth: Update to 0.1.8. * gnu/packages/python-xyz.scm (python-wcwidth): Update to 0.1.8. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a4f36c42cf..3825e308e8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10291,13 +10291,13 @@ (define-public python2-pykafka (define-public python-wcwidth (package (name "python-wcwidth") - (version "0.1.7") + (version "0.1.8") (source (origin (method url-fetch) (uri (pypi-uri "wcwidth" version)) (sha256 (base32 - "0pn6dflzm609m4r3i8ik5ni9ijjbb5fa3vg1n7hn6vkd49r77wrx")))) + "1a1pzds3xzfylm5mnc5f6c1p8kiig0daqjc9gygd9rc3cj53x2zj")))) (build-system python-build-system) (home-page "https://github.com/jquast/wcwidth") (synopsis "Measure number of terminal column cells of wide-character codes") -- cgit v1.2.3 From b244f166b9c74a87875671187c8c33ca2e083e53 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 20:08:46 +0100 Subject: gnu: python-sortedcontainers: Update to 2.1.0. * gnu/packages/python-xyz.scm (python-sortedcontainers): Update to 2.1.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3825e308e8..a81137ff40 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15771,14 +15771,14 @@ (define-public python-cytoolz (define-public python-sortedcontainers (package (name "python-sortedcontainers") - (version "2.0.4") + (version "2.1.0") (source (origin (method url-fetch) (uri (pypi-uri "sortedcontainers" version)) (sha256 (base32 - "10hrk2k0hbf9x78vd3f0lj277m1yzfhzzxr0hja718liwb398wk0")))) + "0fm0w5id2yhqld95hg2m636vjgkz377rvgdfqaxc25vbylr9lklp")))) (build-system python-build-system) (native-inputs `(("python-tox" ,python-tox))) -- cgit v1.2.3 From 4dc04d11c8541ab4390236429ad989f46691aa53 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 20:10:06 +0100 Subject: gnu: python-importlib-metadata: Update to 1.4.0. * gnu/packages/python-xyz.scm (python-importlib-metadata): Update to 1.4.0. [propagated-inputs]: Remove PYTHON-CONFIGPARSER, PYTHON-CONTEXTLIB2, PYTHON-DOCUTILS, PYTHON-PATHLIB2, and PYTHON-RST.LINKER. [native-inputs]: Remove PYTHON-SPHINX. Add PYTHON-PACKAGING. --- gnu/packages/python-xyz.scm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a81137ff40..6cf1fdfa2b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4964,24 +4964,19 @@ (define-public python-pathlib2 (define-public python-importlib-metadata (package (name "python-importlib-metadata") - (version "0.23") + (version "1.4.0") (source (origin (method url-fetch) (uri (pypi-uri "importlib_metadata" version)) (sha256 - (base32 "09mdqdfv5rdrwz80jh9m379gxmvk2vhjfz0fg53hid00icvxf65a")))) + (base32 "1n76444v7zn910xrhh8954jdn4byxbn9f1jck6b85a716mbh2z7i")))) (build-system python-build-system) (propagated-inputs - `(("python-configparser" ,python-configparser) - ("python-contextlib2" ,python-contextlib2) - ("python-docutils" ,python-docutils) - ("python-pathlib2" ,python-pathlib2) - ("python-rst.linker" ,python-rst.linker) - ("python-zipp" ,python-zipp))) + `(("python-zipp" ,python-zipp))) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm) - ("python-sphinx" ,python-sphinx))) + ("python-packaging" ,python-packaging))) (home-page "https://importlib-metadata.readthedocs.io/") (synopsis "Read metadata from Python packages") (description -- cgit v1.2.3 From 8f137daf8af37a8f91f74370948fac3f01728a80 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 20:11:05 +0100 Subject: gnu: python-wheel: Update to 0.33.6. * gnu/packages/python-xyz.scm (python-wheel): Update to 0.33.6. [arguments]: Explicitly disable tests (they never ran before). [native-inputs, properties]: Remove. (python2-wheel): Use PACKAGE-WITH-PYTHON2. --- gnu/packages/python-xyz.scm | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6cf1fdfa2b..9ad4609fb3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1908,18 +1908,20 @@ (define-public python2-click (define-public python-wheel (package (name "python-wheel") - (version "0.32.3") + (version "0.33.6") (source (origin (method url-fetch) (uri (pypi-uri "wheel" version)) (sha256 (base32 - "1dhxl1bf18bx9szmqcnxbg6204hp3im8089q3hkwh5jfa6zh75q2")))) + "0ii6f34rvpjg3nmw4bc2h7fhdsy38y1h93hghncfs5akfrldmj8h")))) (build-system python-build-system) - (native-inputs - `(("python-jsonschema" ,python-jsonschema) - ("python-pytest-cov" ,python-pytest-cov))) + (arguments + ;; FIXME: The test suite runs "python setup.py bdist_wheel", which in turn + ;; fails to find the newly-built bdist_wheel library, even though it is + ;; available on PYTHONPATH. What search path is consulted by setup.py? + '(#:tests? #f)) (home-page "https://bitbucket.org/pypa/wheel/") (synopsis "Format for built Python packages") (description @@ -1930,15 +1932,10 @@ (define-public python-wheel unpacked archive preserves enough information to @code{Spread} (copy data and scripts to their final locations) at any later time. Wheel files can be installed with a newer @code{pip} or with wheel's own command line utility.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-wheel)))))) + (license license:expat))) (define-public python2-wheel - (let ((wheel (package-with-python2 - (strip-python2-variant python-wheel)))) - (package (inherit wheel) - (native-inputs `(("python2-functools32" ,python2-functools32) - ,@(package-native-inputs wheel)))))) + (package-with-python2 python-wheel)) (define-public python-vcversioner (package -- cgit v1.2.3 From fd5c264ad8c97ce5e44fdcabd25132d019eee953 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 20:11:49 +0100 Subject: gnu: Add python2-importlib-resources. * gnu/packages/python-xyz.scm (python2-importlib-resources): New public variable. --- gnu/packages/python-xyz.scm | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9ad4609fb3..430ed4a13e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016 David Craven -;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2016, 2017 Stefan Reichör ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016, 2017, 2019 Alex Vong @@ -4958,6 +4958,31 @@ (define-public python-pathlib2 older Python versions.") (license license:expat))) +(define-public python2-importlib-resources + (package + (name "python2-importlib-resources") + (version "1.0.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "importlib_resources" version)) + (sha256 + (base32 + "0y3hg12iby1qyaspnbisz4s4vxax7syikk3skznwqizqyv89y9yk")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2)) + (native-inputs + `(("python-wheel" ,python2-wheel))) + (propagated-inputs + `(("python-pathlib2" ,python2-pathlib2) + ("python-typing" ,python2-typing))) + (home-page "https://gitlab.com/python-devs/importlib_resources") + (synopsis "Backport of @code{importlib.resources} from Python 3.7") + (description + "This package provides an implementation of @code{importlib.resources} +for older versions of Python.") + (license license:asl2.0))) + (define-public python-importlib-metadata (package (name "python-importlib-metadata") -- cgit v1.2.3 From 5efa04dd935ecf6f7803501b1b8952810f4330ad Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 20:14:02 +0100 Subject: gnu: Add python2-importlib-metadata. * gnu/packages/python-xyz.scm (python2-importlib-metadata): New public variable. --- gnu/packages/python-xyz.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 430ed4a13e..6d8e9caefc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5010,6 +5010,19 @@ (define-public python-importlib-metadata need to use the older and less efficient @code{pkg_resources} package.") (license license:asl2.0))) +(define-public python2-importlib-metadata + (let ((base (package-with-python2 (strip-python2-variant + python-importlib-metadata)))) + (package/inherit + base + (name "python2-importlib-metadata") + (propagated-inputs + `(("python-configparser" ,python2-configparser) + ("python-contextlib2" ,python2-contextlib2) + ("python-importlib-resources" ,python2-importlib-resources) + ("python-pathlib2" ,python2-pathlib2) + ,@(package-propagated-inputs base)))))) + (define-public python-jaraco-packaging (package (name "python-jaraco-packaging") -- cgit v1.2.3 From 8fda8b7d6addf5e354e58e449c1a4a8894cb658b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 20:18:05 +0100 Subject: gnu: python-elementpath: Move to (gnu packages xml). * gnu/packages/python-xyz.scm (python-elementpath): Move from here ... * gnu/packages/xml.scm (python-elementpath): ... to here. --- gnu/packages/python-xyz.scm | 25 ------------------------- gnu/packages/xml.scm | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 25 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6d8e9caefc..1f8b936a12 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16621,31 +16621,6 @@ (define-public python-pyroutelib3 (description "Library for simple routing on OSM data") (license license:gpl3+))) -(define-public python-elementpath - (package - (name "python-elementpath") - (version "1.2.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "elementpath" version)) - (sha256 - (base32 - "1syn2z543brab23dskh3fjd9pqvz6npqbcicrs2d88dbg26xl08p")))) - (build-system python-build-system) - (home-page - "https://github.com/sissaschool/elementpath") - (synopsis - "XPath 1.0/2.0 parsers and selectors for ElementTree and lxml") - (description - "The proposal of this package is to provide XPath 1.0 and 2.0 selectors -for Python's ElementTree XML data structures, both for the standard -ElementTree library and for the @uref{http://lxml.de, lxml.etree} library. - -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-bibtexparser (package (name "python-bibtexparser") diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 5b9082cb26..83a2f1b713 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2017 Stefan Reichör ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Jack Hill +;;; Copyright © 2019 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -2050,6 +2051,31 @@ (define-public xmlrpc-c modular implementation of XML-RPC for C and C++.") (license (list license:psfl license:expat)))) +(define-public python-elementpath + (package + (name "python-elementpath") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "elementpath" version)) + (sha256 + (base32 + "1syn2z543brab23dskh3fjd9pqvz6npqbcicrs2d88dbg26xl08p")))) + (build-system python-build-system) + (home-page + "https://github.com/sissaschool/elementpath") + (synopsis + "XPath 1.0/2.0 parsers and selectors for ElementTree and lxml") + (description + "The proposal of this package is to provide XPath 1.0 and 2.0 selectors +for Python's ElementTree XML data structures, both for the standard +ElementTree library and for the @uref{http://lxml.de, lxml.etree} library. + +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-xmltodict (package (name "python-xmltodict") -- cgit v1.2.3 From 55e1475cb58c1b9535b35f8bdb157b1435c54755 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 20:19:26 +0100 Subject: 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. --- gnu/packages/django.scm | 3 ++- gnu/packages/drones.scm | 1 + gnu/packages/libreoffice.scm | 1 - gnu/packages/nutrition.scm | 3 ++- gnu/packages/openstack.scm | 1 + gnu/packages/pulseaudio.scm | 1 + gnu/packages/python-science.scm | 1 + gnu/packages/python-xyz.scm | 29 ----------------------------- gnu/packages/tryton.scm | 1 + gnu/packages/wireservice.scm | 3 ++- gnu/packages/xml.scm | 29 +++++++++++++++++++++++++++++ 11 files changed, 40 insertions(+), 33 deletions(-) (limited to 'gnu/packages/python-xyz.scm') 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 @@ (define-module (gnu packages django) #: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 @@ (define-module (gnu packages drones) #: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 @@ (define-module (gnu packages libreoffice) #: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 @@ (define-module (gnu packages nutrition) #: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 @@ (define-module (gnu packages openstack) #: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 @@ (define-module (gnu packages pulseaudio) #: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 @@ (define-module (gnu packages python-science) #: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 @@ (define-public python-notify2 (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 @@ (define-module (gnu packages tryton) #: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 @@ (define-module (gnu packages wireservice) #: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 @@ (define-public python-elementpath 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") -- cgit v1.2.3 From 602f3b679325c30b62201999f1d4f211f08fc0e5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 16 Jan 2020 16:49:23 +0100 Subject: gnu: Add python-speg. * gnu/packages/python-xyz.scm (python-speg): New variable. --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 479466cc81..97da0974e0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17073,3 +17073,24 @@ (define-public python-funcparserlib functional combinators. Parser combinators are just higher-order functions that take parsers as their arguments and return them as result values.") (license license:expat))) + +(define-public python-speg + (package + (name "python-speg") + (version "0.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "speg" version ".zip")) + (sha256 + (base32 "0w9y4jf4787dzhy6rvhwi0mpl0r8qkqmqmyv2hpwdpv8w53yzjqh")))) + (arguments + `(#:tests? #f)) ;FIXME: tests fail, not sure why + (native-inputs + `(("unzip" ,unzip))) + (build-system python-build-system) + (home-page "https://github.com/avakar/speg") + (synopsis "PEG-based parser interpreter with memoization") + (description "This package is a PEG-based parser and interpreter with +memoization.") + (license license:expat))) -- cgit v1.2.3 From 07c8177b885f1fca367b9cf8befc3328392d79c2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 16 Jan 2020 16:49:43 +0100 Subject: gnu: Add python-cson. * gnu/packages/python-xyz.scm (python-cson): New variable. --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 97da0974e0..41a2df0cf3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17094,3 +17094,22 @@ (define-public python-speg (description "This package is a PEG-based parser and interpreter with memoization.") (license license:expat))) + +(define-public python-cson + (package + (name "python-cson") + (version "0.8") + (source + (origin + (method url-fetch) + (uri (pypi-uri "cson" version)) + (sha256 + (base32 "00cyvigg4npbph39ghkg77xbxisa6plf75vii24igxfizik0337f")))) + (build-system python-build-system) + (propagated-inputs + `(("python-speg" ,python-speg))) + (home-page "https://github.com/avakar/pycson") + (synopsis "Parser for Coffeescript Object Notation (CSON)") + (description "This package is a parser for Coffeescript Object +Notation (CSON).") + (license license:expat))) -- cgit v1.2.3 From a2548a3b5efb1ff17b19bc86e86940875c0a9f40 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 16 Jan 2020 18:06:36 +0100 Subject: gnu: Update copyright header. * gnu/packages/python-xyz.scm: Update copyright header. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 41a2df0cf3..054974d44f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -51,7 +51,7 @@ ;;; Copyright © 2018 Mathieu Lirzin ;;; Copyright © 2018 Adam Massmann ;;; Copyright © 2016, 2018 Tomáš Čech -;;; Copyright © 2018, 2019 Nicolas Goaziou +;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018, 2019 Clément Lassieur ;;; Copyright © 2018, 2019 Maxim Cournoyer -- cgit v1.2.3 From cbd3e73f06ed0e47bd228f51ce0d88b5bc4d8d2c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 21:49:37 +0100 Subject: gnu: poetry: Remove redundant input. * gnu/packages/python-xyz.scm (poetry)[propagated-inputs]: Remove PYTHON-PATHLIB2. --- gnu/packages/python-xyz.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 054974d44f..31ea51be29 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10600,7 +10600,6 @@ (define-public poetry ("python-html5lib" ,python-html5lib) ("python-jsonschema" ,python-jsonschema) ("python-msgpack" ,python-msgpack) - ("python-pathlib2" ,python-pathlib2) ("python-pkginfo" ,python-pkginfo) ("python-pyparsing" ,python-pyparsing) ("python-pyrsistent" ,python-pyrsistent) -- cgit v1.2.3 From fdd0c36963a62577f7a8f99a44f79a7330a0b151 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Jan 2020 17:20:22 +0100 Subject: gnu: python-packaging: Fix test failures on non-x86_64 architectures. * gnu/packages/patches/python-packaging-test-arch.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/python-xyz.scm (python-packaging)[source](patches): New field. --- gnu/local.mk | 1 + .../patches/python-packaging-test-arch.patch | 65 ++++++++++++++++++++++ gnu/packages/python-xyz.scm | 1 + 3 files changed, 67 insertions(+) create mode 100644 gnu/packages/patches/python-packaging-test-arch.patch (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/local.mk b/gnu/local.mk index e77af87f3e..e2a837fe92 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1319,6 +1319,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-libxml2-utf8.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-testtools.patch \ + %D%/packages/patches/python-packaging-test-arch.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ diff --git a/gnu/packages/patches/python-packaging-test-arch.patch b/gnu/packages/patches/python-packaging-test-arch.patch new file mode 100644 index 0000000000..df80a62544 --- /dev/null +++ b/gnu/packages/patches/python-packaging-test-arch.patch @@ -0,0 +1,65 @@ +Fix tests that are "hard coded" to expect x86_64 output by mocking the platform interface. + +Submitted upstream: +https://github.com/pypa/packaging/pull/176 + +diff --git a/tests/test_tags.py b/tests/test_tags.py +index 1eacf68..0a3f1b4 100644 +--- a/tests/test_tags.py ++++ b/tests/test_tags.py +@@ -435,37 +435,43 @@ class TestManylinuxPlatform: + linux_platform = list(tags._linux_platforms(is_32bit=False)) + assert linux_platform == ["linux_x86_64"] + +- def test_linux_platforms_manylinux1(self, monkeypatch): ++ def test_linux_platforms_manylinux1(self, is_x86, monkeypatch): + monkeypatch.setattr( + tags, "_is_manylinux_compatible", lambda name, _: name == "manylinux1" + ) +- if platform.system() != "Linux": ++ if platform.system() != "Linux" or not is_x86: + monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_x86_64") ++ monkeypatch.setattr(platform, "machine", lambda: "x86_64") + platforms = list(tags._linux_platforms(is_32bit=False)) +- assert platforms == ["manylinux1_x86_64", "linux_x86_64"] ++ arch = platform.machine() ++ assert platforms == ["manylinux1_" + arch, "linux_" + arch] + +- def test_linux_platforms_manylinux2010(self, monkeypatch): ++ def test_linux_platforms_manylinux2010(self, is_x86, monkeypatch): + monkeypatch.setattr( + tags, "_is_manylinux_compatible", lambda name, _: name == "manylinux2010" + ) +- if platform.system() != "Linux": ++ if platform.system() != "Linux" or not is_x86: + monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_x86_64") ++ monkeypatch.setattr(platform, "machine", lambda: "x86_64") + platforms = list(tags._linux_platforms(is_32bit=False)) +- expected = ["manylinux2010_x86_64", "manylinux1_x86_64", "linux_x86_64"] ++ arch = platform.machine() ++ expected = ["manylinux2010_" + arch, "manylinux1_" + arch, "linux_" + arch] + assert platforms == expected + +- def test_linux_platforms_manylinux2014(self, monkeypatch): ++ def test_linux_platforms_manylinux2014(self, is_x86, monkeypatch): + monkeypatch.setattr( + tags, "_is_manylinux_compatible", lambda name, _: name == "manylinux2014" + ) +- if platform.system() != "Linux": ++ if platform.system() != "Linux" or not is_x86: + monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_x86_64") ++ monkeypatch.setattr(platform, "machine", lambda: "x86_64") + platforms = list(tags._linux_platforms(is_32bit=False)) ++ arch = platform.machine() + expected = [ +- "manylinux2014_x86_64", +- "manylinux2010_x86_64", +- "manylinux1_x86_64", +- "linux_x86_64", ++ "manylinux2014_" + arch, ++ "manylinux2010_" + arch, ++ "manylinux1_" + arch, ++ "linux_" + arch, + ] + assert platforms == expected + diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 31ea51be29..ee2fc11eb1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13054,6 +13054,7 @@ (define-public python-packaging (origin (method url-fetch) (uri (pypi-uri "packaging" version)) + (patches (search-patches "python-packaging-test-arch.patch")) (sha256 (base32 "1y2ip3a4ykkpgnwgn85j6hkspcl0cg3mzms97f40mk57vwqq67gy")))) -- cgit v1.2.3 From 3dfb3d44f316f95401558fb32b3b3e4e464f419c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Jan 2020 17:22:28 +0100 Subject: gnu: python-importlib-metata: Delay python2 variant. This is a follow-up to commit 5efa04dd935ecf6f7803501b1b8952810f4330ad. * gnu/packages/python-xyz.scm (python-importlib-metadata)[properties]: New field. --- gnu/packages/python-xyz.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ee2fc11eb1..6bb2a5a5be 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5008,6 +5008,7 @@ (define-public python-importlib-metadata @code{pkg_resources} entry point API and metadata API. Along with @code{importlib.resources} in Python 3.7 and newer, this can eliminate the need to use the older and less efficient @code{pkg_resources} package.") + (properties `((python2-variant . ,(delay python2-importlib-metadata)))) (license license:asl2.0))) (define-public python2-importlib-metadata -- cgit v1.2.3 From eebc03bbb827ec8def27eee9dd79a5bd70534b51 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Jan 2020 18:44:09 +0100 Subject: gnu: python-objgraph: Update to 3.4.1. * gnu/packages/python-xyz.scm (python-objgraph): Update to 3.4.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6bb2a5a5be..5d20144f06 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9985,14 +9985,14 @@ (define-public python2-greenlet (define-public python-objgraph (package (name "python-objgraph") - (version "3.4.0") + (version "3.4.1") (source (origin (method url-fetch) (uri (pypi-uri "objgraph" version)) (sha256 (base32 - "184m09am5gpbqfaiy7l0hwh476mczbrly1dffs0rw2p1d1i2q32a")))) + "19qmqsh984zq1rzzjy4vqnmviaqnymcyl8h7z99pnicbgwnm2adz")))) (build-system python-build-system) (propagated-inputs `(("python-graphviz" ,python-graphviz))) -- cgit v1.2.3 From ffe58d1d44bb6e9eff3c489b07649426280e326a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Jan 2020 18:44:32 +0100 Subject: gnu: Add python2-objgraph. * gnu/packages/python-xyz.scm (python2-objgraph): New public variable. --- gnu/packages/python-xyz.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5d20144f06..76d38807d3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10006,6 +10006,9 @@ (define-public python-objgraph graphviz.") (license license:expat))) +(define-public python2-objgraph + (package-with-python2 python-objgraph)) + (define-public python-gevent (package (name "python-gevent") -- cgit v1.2.3 From e24c672e740664c1340a4ff8bf43a21b4bd3e5d1 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 18 Jan 2020 17:27:25 +0800 Subject: gnu: Add python-asynctest. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-asynctest): New variable. Signed-off-by: 宋文武 --- gnu/packages/python-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 76d38807d3..e14bbc1bbd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17117,3 +17117,36 @@ (define-public python-cson (description "This package is a parser for Coffeescript Object Notation (CSON).") (license license:expat))) + +(define-public python-asynctest + (package + (name "python-asynctest") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "asynctest" version)) + (sha256 + (base32 + "1b3zsy7p84gag6q8ai2ylyrhx213qdk2h2zb6im3xn0m5n264y62")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "python" "-X" "dev" "-m" "unittest" "-v" "test"))) + (add-after 'unpack 'disable-tests + (lambda* _ + (substitute* "test/test_selector.py" + ;; XXX: This test fails for unknown reason inside the build + ;; environment. + (("def test_events_watched_outside_test_are_ignored") + "@unittest.skip('disabled by guix') + def test_events_watched_outside_test_are_ignored"))))))) + (home-page "https://github.com/Martiusweb/asynctest") + (synopsis "Extension of unittest for testing asyncio libraries") + (description + "The package asynctest is built on top of the standard unittest module +and cuts down boilerplate code when testing libraries for asyncio.") + (license license:asl2.0))) -- cgit v1.2.3 From 1cc9c38e902aeb03295e9728b4cf40ff2b302716 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 18 Jan 2020 17:41:21 +0800 Subject: gnu: Add python-aionotify. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-aionotify): New variable. Signed-off-by: 宋文武 --- gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e14bbc1bbd..2bef867630 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17150,3 +17150,25 @@ (define-public python-asynctest "The package asynctest is built on top of the standard unittest module and cuts down boilerplate code when testing libraries for asyncio.") (license license:asl2.0))) + +(define-public python-aionotify + (package + (name "python-aionotify") + (version "0.2.0") + (source + (origin + ;; Source tarball on PyPi lacks tests + (method git-fetch) + (uri (git-reference + (url "https://github.com/rbarrois/aionotify") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1sk9i8czxgsbrswsf1nlb4c82vgnlzi8zrvrxdip92w2z8hqh43y")))) + (build-system python-build-system) + (native-inputs `(("python-asynctest" ,python-asynctest))) + (home-page "https://github.com/rbarrois/aionotify") + (synopsis "Asyncio-powered inotify library") + (description + "@code{aionotify} is a simple, asyncio-based inotify library.") + (license license:bsd-3))) -- cgit v1.2.3 From 81e3ba033feee78174da4499b3be0565f879f7b9 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sat, 18 Jan 2020 14:01:19 -0600 Subject: gnu: python-language-server: Update to 0.31.6. * gnu/packages/python-xyz.scm (python-language-server): Update to 0.31.6. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2bef867630..f1b0f991c6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3052,14 +3052,14 @@ (define-public python-pydocstyle (define-public python-language-server (package (name "python-language-server") - (version "0.31.4") + (version "0.31.6") (source (origin (method url-fetch) (uri (pypi-uri "python-language-server" version)) (sha256 (base32 - "1nrs56jpx7dvghaas0kc5k9lxas5vr3awj3k87p4akki43nsblb8")))) + "0cqrffd5272p2hifa35rf1h1g6dss741jmjkwa43jninifmbz0df")))) (build-system python-build-system) (propagated-inputs `(("python-pluggy" ,python-pluggy) -- cgit v1.2.3 From 84efaa3b8ea8913f9a99f40d8d96a62f2dd41b8c Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 13 Jan 2020 08:46:50 +0100 Subject: gnu: Add python-forbiddenfruit. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-forbiddenfruit): New variable. Signed-off-by: 宋文武 --- gnu/packages/python-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f1b0f991c6..887c336883 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17172,3 +17172,32 @@ (define-public python-aionotify (description "@code{aionotify} is a simple, asyncio-based inotify library.") (license license:bsd-3))) + +(define-public python-forbiddenfruit + (package + (name "python-forbiddenfruit") + (version "0.1.3") + (source + (origin + ;; Source tarball on PyPi lacks Makefile that builds and runs tests + (method git-fetch) + (uri (git-reference + (url "https://github.com/clarete/forbiddenfruit") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fp2xvdqpi910j9r3q68x38phpxbm700gjdi2m2j5gs91xdnyyh2")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "make" "SKIP_DEPS=1")))))) + (native-inputs + `(("python-nose" ,python-nose) + ("python-coverage" ,python-coverage))) + (home-page "https://github.com/clarete/forbiddenfruit") + (synopsis "Patch python built-in objects") + (description "This project allows Python code to extend built-in types.") + (license (list license:gpl3+ license:expat)))) -- cgit v1.2.3 From 9786258b4d6aabd686187c7eae9af5dfb523893a Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 13 Jan 2020 08:46:49 +0100 Subject: gnu: Add python-shouldbe. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-shouldbe): New variable. Signed-off-by: 宋文武 --- gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 887c336883..eb61d828f9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17201,3 +17201,25 @@ (define-public python-forbiddenfruit (synopsis "Patch python built-in objects") (description "This project allows Python code to extend built-in types.") (license (list license:gpl3+ license:expat)))) + +(define-public python-shouldbe + (package + (name "python-shouldbe") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "shouldbe" version)) + (sha256 + (base32 + "16zbvjxf71dl4yfbgcr6idyim3mdrfvix1dv8b95p0s9z07372pj")))) + (build-system python-build-system) + (propagated-inputs + `(("python-forbiddenfruit" ,python-forbiddenfruit))) + (native-inputs + `(("python-nose" ,python-nose))) + (home-page "https://github.com/directxman12/should_be") + (synopsis "Python Assertion Helpers inspired by Shouldly") + (description + "Python Assertion Helpers inspired by Shouldly.") + (license license:isc))) -- cgit v1.2.3 From 72c2478add21060d8318ddfe23cf3c16c1b3412b Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 13 Jan 2020 08:46:51 +0100 Subject: gnu: Add python-k5test. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-k5test): New variable. Signed-off-by: 宋文武 --- gnu/packages/python-xyz.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index eb61d828f9..8dfbc8c363 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -112,6 +112,7 @@ (define-module (gnu packages python-xyz) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) + #:use-module (gnu packages kerberos) #:use-module (gnu packages libevent) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) @@ -17223,3 +17224,37 @@ (define-public python-shouldbe (description "Python Assertion Helpers inspired by Shouldly.") (license license:isc))) + +(define-public python-k5test + (package + (name "python-k5test") + (version "0.9.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "k5test" version)) + (sha256 + (base32 + "1lqp3jgfngyhaxjgj3n230hn90wsylwilh120yjf62h7b1s02mh8")))) + (build-system python-build-system) + (propagated-inputs + `(("python-six" ,python-six) + ;; `which`, `kadmin.local` binaries called inside library + ("which" ,which) + ("mit-krb5" ,mit-krb5))) + (native-inputs `(("mit-krb5" ,mit-krb5))) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* _ + (substitute* "k5test/realm.py" + (("'kadmin_local'") "'kadmin.local'"))))))) + (home-page "https://github.com/pythongssapi/k5test") + (synopsis "Library for setting up self-contained Kerberos 5 environments") + (description + "@code{k5test} is a library for setting up self-contained Kerberos 5 +environments, and running Python unit tests inside those environments. It is +based on the file of the same name found alongside the MIT Kerberos 5 unit +tests.") + (license license:isc))) -- cgit v1.2.3 From a8ef4978f29c3fb069066430587f331f61432f21 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 13 Jan 2020 08:46:52 +0100 Subject: gnu: Add python-gssapi. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-gssapi): New variable. Signed-off-by: 宋文武 --- gnu/packages/python-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8dfbc8c363..617c3b4c7a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17258,3 +17258,34 @@ (define-public python-k5test based on the file of the same name found alongside the MIT Kerberos 5 unit tests.") (license license:isc))) + +(define-public python-gssapi + (package + (name "python-gssapi") + (version "1.6.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "gssapi" version)) + (sha256 + (base32 + "1gymg4asvwrz7y13qpwp2s5g8qwq179d72gkj09q6bfcgs82l5wr")))) + (build-system python-build-system) + (propagated-inputs + `(("python-decorator" ,python-decorator) + ("python-six" ,python-six))) + (inputs + `(("mit-krb5" ,mit-krb5))) + ;; for tests + (native-inputs + `(("python-shouldbe" ,python-shouldbe) + ("python-parameterized" ,python-parameterized) + ("python-k5test" ,python-k5test) + ("python-nose" ,python-nose))) + (home-page "https://github.com/pythongssapi/python-gssapi") + (synopsis "Python GSSAPI Wrapper") + (description + "Python-GSSAPI provides both low-level and high level wrappers around the +GSSAPI C libraries. While it focuses on the Kerberos mechanism, it should +also be useable with other GSSAPI mechanisms.") + (license license:isc))) -- cgit v1.2.3 From 20bf58bff470bfacb16cb5c1fd731c707f8dd077 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Jan 2020 22:06:54 +0100 Subject: gnu: python-packaging: Add comment about upstream patch status. * gnu/packages/python-xyz.scm (python-packaging)[source]: Add comment, to prevent needless rebuild by updating the patch directly. --- gnu/packages/python-xyz.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 617c3b4c7a..dce1dddfba 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13059,6 +13059,8 @@ (define-public python-packaging (origin (method url-fetch) (uri (pypi-uri "packaging" version)) + ;; XXX: The URL in the patch file is wrong, it should be + ;; . (patches (search-patches "python-packaging-test-arch.patch")) (sha256 (base32 -- cgit v1.2.3 From 544ea9c2df82bd737319b29a0e4f9b2f39c6321a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 20:23:18 +0100 Subject: gnu: Add python-anytree. * gnu/packages/python-xyz.scm (python-anytree): New public variable. --- gnu/packages/python-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index dce1dddfba..715a0109f7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2584,6 +2584,30 @@ (define-public python-daemon ;; Only setup.py is gpl3+, everything else is apache 2.0 licensed. (license (list license:asl2.0 license:gpl3+)))) +(define-public python-anytree + (package + (name "python-anytree") + (version "2.8.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "anytree" version)) + (sha256 + (base32 + "1aycpc387wqz7h9w2p53qxn43qsh3m6by6ak4kkc66x9aprr63rz")))) + (build-system python-build-system) + (propagated-inputs + `(("python-six" ,python-six))) + (native-inputs + `(;; For tests. + ("graphviz" ,graphviz) ;for 'dot' + ("python-nose" ,python-nose))) + (home-page "https://github.com/c0fec0de/anytree") + (synopsis "Lightweight tree data library") + (description + "@code{anytree} is a simple, lightweight, and extensible tree data +structure for Python.") + (license license:asl2.0))) + (define-public python-docutils (package (name "python-docutils") -- cgit v1.2.3