From e95c983706164bdd93176b0632369e7df23dfc87 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 22:10:58 +0200 Subject: gnu: python-idna: Update to 2.8. * gnu/packages/python-xyz.scm (python-idna): Update to 2.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 14fb413cf4..bf309f4a0b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6645,14 +6645,14 @@ versions of Python.") (define-public python-idna (package (name "python-idna") - (version "2.7") + (version "2.8") (source (origin (method url-fetch) (uri (pypi-uri "idna" version)) (sha256 (base32 - "05jam7d31767dr12x0rbvvs8lxnpb1mhdb2zdlfxgh83z6k3hjk8")))) + "01rlkigdxg17sf9yar1jl8n18ls59367wqh59hnawlyg53vb6my3")))) (build-system python-build-system) (home-page "https://github.com/kjd/idna") (synopsis "Internationalized domain names in applications") -- cgit 1.4.1 From bcfb8fac36b8c02fb190f4b2c66272dbe8c06a91 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 22:12:23 +0200 Subject: gnu: python-m2r: Update to 0.2.1. * gnu/packages/python-xyz.scm (python-m2r): Update to 0.2.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 bf309f4a0b..eefa2be76b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11327,13 +11327,13 @@ transducers).") (define-public python-m2r (package (name "python-m2r") - (version "0.1.12") + (version "0.2.1") (source (origin (method url-fetch) (uri (pypi-uri "m2r" version)) (sha256 (base32 - "1axrwnf425sz4qz3c0qc7yhhki4myzb8rki7pczcsgzznzmqdyxd")))) + "16gdm8i06jjmlpvckpfmlkr4693dh0vs192vgsqn84fsdkbbm45z")))) (build-system python-build-system) (propagated-inputs `(("python-docutils" ,python-docutils) -- cgit 1.4.1 From 919d80a0e06839051dc1bcacd260c8b22092b47b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 22:12:53 +0200 Subject: gnu: python-automat: Update to 0.7.0. * gnu/packages/python-xyz.scm (python-automat): Update to 0.7.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 eefa2be76b..df3adf47e1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11294,13 +11294,13 @@ instead of servers and network commands.") (define-public python-automat (package (name "python-automat") - (version "0.6.0") + (version "0.7.0") (source (origin (method url-fetch) (uri (pypi-uri "Automat" version)) (sha256 (base32 - "1a7nsrljysfmdqmpn2apfa1gg6rfah4y9sizvns8gb08rx7d07rw")))) + "03ivg70n3b1cbcd2zvjhk8y4kmqxcvhmili39lmgx09dza1qpmyb")))) (build-system python-build-system) ;; We disable the tests because they require python-twisted, while ;; python-twisted depends on python-automat. Twisted is optional, but the -- cgit 1.4.1 From 52ca1c4abf6deaef2d5d5b9b7fc4d9dc949ae59c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 22:15:24 +0200 Subject: gnu: python-twisted: Update to 19.2.0. * gnu/packages/python-xyz.scm (python-twisted): Update to 19.2.0. [propagated-inputs]: Add PYTHON-PYHAMCREST. --- gnu/packages/python-xyz.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index df3adf47e1..212f550b59 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9381,23 +9381,19 @@ format.") (define-public python-twisted (package (name "python-twisted") - (version "17.5.0") + (version "19.2.0") (source (origin (method url-fetch) (uri (pypi-uri "Twisted" version ".tar.bz2")) (sha256 (base32 - "1sh2h23nnizcdyrl2rn7zxijglikxwz7z7grqpvq496zy2aa967i")))) + "1gmb8d57s13d8znvqnxi47vqzqz141z443dbxg9wjkp8ia9f220p")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; FIXME: Some tests are failing. - ;; #:phases - ;; (modify-phases %standard-phases - ;; (replace 'check - ;; (lambda _ - ;; (zero? (system* "./bin/trial" "twisted"))))) (propagated-inputs `(("python-zope-interface" ,python-zope-interface) + ("python-pyhamcrest" ,python-pyhamcrest) ("python-incremental" ,python-incremental) ("python-hyperlink" ,python-hyperlink) ("python-constantly" ,python-constantly) -- cgit 1.4.1 From ea43f0d58186fe5686800ccc3d5373b4e6fc48b9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 22:18:49 +0200 Subject: gnu: Add python-pyrsistent. * gnu/packages/python-xyz.scm (python-pyrsistent, python2-pyrsistent): New public variables. --- gnu/packages/python-xyz.scm | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 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 212f550b59..45bb6548af 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 Marius Bakke +;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2016, 2017 Stefan Reichör ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016, 2017 Alex Vong @@ -1722,6 +1722,37 @@ from git information. (define-public python2-pbr (package-with-python2 python-pbr)) +(define-public python-pyrsistent + (package + (name "python-pyrsistent") + (version "0.14.11") + (home-page "https://github.com/tobgu/pyrsistent") + (source (origin + (method url-fetch) + (uri (pypi-uri "pyrsistent" version)) + (sha256 + (base32 + "1qkh74bm296mp5g3r11lgsksr6bh4w1bf8pji4nmxdlfj542ga1w")))) + (build-system python-build-system) + (native-inputs + `(("python-hypothesis" ,python-hypothesis) + ("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner))) + (propagated-inputs + `(("python-six" ,python-six))) + (synopsis "Persistent data structures for Python") + (description + "Pyrsistent is a number of persistent collections (by some referred to as +functional data structures). Persistent in the sense that they are immutable. + +All methods on a data structure that would normally mutate it instead return a +new copy of the structure containing the requested updates. The original +structure is left untouched.") + (license license:expat))) + +(define-public python2-pyrsistent + (package-with-python2 python-pyrsistent)) + (define-public python-exif-read (package (name "python-exif-read") -- cgit 1.4.1 From 1adde06e4e70e124229316d7781b0527b64de088 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 22:19:22 +0200 Subject: gnu: python-jsonschema: Update to 3.0.1. * gnu/packages/python-xyz.scm (python-jsonschema): Update to 3.0.1. [arguments]: Adjust check phase for Twisted instead of nosetests. [native-inputs]: Remove PYTHON-NOSE and PYTHON-VCVERSIONER. Add PYTHON-SETUPTOOLS-SCM and PYTHON-TWISTED. [propagated-inputs]: Add PYTHON-ATTRS, PYTHON-PYRSISTENT and PYTHON-SIX. (python2-jsonschema)[native-inputs, propagated-inputs]: Inherit. --- gnu/packages/python-xyz.scm | 23 ++++++++++++++--------- 1 file changed, 14 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 45bb6548af..4e0a67a1e8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1923,21 +1923,28 @@ between Julian dates and Gregorian dates.") (define-public python-jsonschema (package (name "python-jsonschema") - (version "2.6.0") + (version "3.0.1") (source (origin (method url-fetch) (uri (pypi-uri "jsonschema" version)) (sha256 (base32 - "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg")))) + "03g20i1xfg4qdlk4475pl4pp7y0h37g1fbgs5qhy678q9xb822hc")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases - (replace 'check (lambda _ (invoke "nosetests")))))) + (replace 'check + (lambda _ + (setenv "PYTHONPATH" (string-append ".:" (getenv "PYTHONPATH"))) + (invoke "trial" "jsonschema")))))) (native-inputs - `(("python-nose" ,python-nose) - ("python-vcversioner" ,python-vcversioner))) + `(("python-setuptools_scm" ,python-setuptools-scm) + ("python-twisted" ,python-twisted))) + (propagated-inputs + `(("python-attrs" ,python-attrs) + ("python-pyrsistent" ,python-pyrsistent) + ("python-six" ,python-six))) (home-page "https://github.com/Julian/jsonschema") (synopsis "Implementation of JSON Schema for Python") (description @@ -1949,11 +1956,9 @@ between Julian dates and Gregorian dates.") (let ((jsonschema (package-with-python2 (strip-python2-variant python-jsonschema)))) (package (inherit jsonschema) - (native-inputs - `(("python2-mock" ,python2-mock) - ,@(package-native-inputs jsonschema))) (propagated-inputs - `(("python2-functools32" ,python2-functools32)))))) + `(("python2-functools32" ,python2-functools32) + ,@(package-propagated-inputs jsonschema)))))) (define-public python-schema (package -- cgit 1.4.1 From 4782a06f45d515eebc4d1ee8e958def409a0ef9f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 22:31:51 +0200 Subject: gnu: python-send2trash: Properly delay python2 variant. * gnu/packages/python-xyz.scm (python2-send2trash)[properties]: Move from here ... (python-send2trash)[properties]: ... to here. --- 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 4e0a67a1e8..51382184d2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13581,6 +13581,7 @@ and works only with Python 2 and NumPy < 1.9.") (synopsis "Send files to the user's @file{~/Trash} directory") (description "This package provides a Python library to send files to the user's @file{~/Trash} directory.") + (properties `((python2-variant . ,(delay python-send2trash)))) (license license:bsd-3))) (define-public python2-send2trash @@ -13594,8 +13595,7 @@ user's @file{~/Trash} directory.") (lambda _ (setenv "PYTHONPATH" (string-append (getcwd) ":" (getenv "PYTHONPATH"))) - #t)))))) - (properties `((python2-variant . ,(delay python-send2trash)))))) + #t)))))))) (define-public python-yapf (package -- cgit 1.4.1 From 20b3fde7763a14f605ac8a0aba1abfa73a6e7dda Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Apr 2019 01:57:34 +0200 Subject: gnu: python-send2trash: Really delay Python2 variant. This is a follow-up to commit 4782a06f45d515eebc4d1ee8e958def409a0ef9f, which somehow solved my problem, but did so incorrectly. * gnu/packages/python-xyz.scm (python-send2trash)[properties]: Refer to PYTHON2-SEND2TRASH. --- 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 51382184d2..f64a09e9b3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13581,7 +13581,7 @@ and works only with Python 2 and NumPy < 1.9.") (synopsis "Send files to the user's @file{~/Trash} directory") (description "This package provides a Python library to send files to the user's @file{~/Trash} directory.") - (properties `((python2-variant . ,(delay python-send2trash)))) + (properties `((python2-variant . ,(delay python2-send2trash)))) (license license:bsd-3))) (define-public python2-send2trash -- cgit 1.4.1 From f32164abd3d9c307959cf60393cdc9027b8703ca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Apr 2019 02:29:43 +0200 Subject: gnu: python2-send2trash: Don't inherit properties from python-send2trash. This is a follow-up to commit 20b3fde7763a14f605ac8a0aba1abfa73a6e7dda. Commits and beer do not mix well. * gnu/packages/python-xyz.scm (python2-send2trash): Inherit using STRIP-PYTHON2-VARIANT. --- 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 f64a09e9b3..9d661411c4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13586,7 +13586,7 @@ user's @file{~/Trash} directory.") (define-public python2-send2trash (package - (inherit (package-with-python2 python-send2trash)) + (inherit (package-with-python2 (strip-python2-variant python-send2trash))) (arguments (substitute-keyword-arguments (package-arguments python-send2trash) ((#:phases phases) -- cgit 1.4.1 From 441e6d936fd24acc9fe7d609735722a9f49a07cc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Apr 2019 00:31:37 +0200 Subject: gnu: python-openpyxl: Update to 2.6.2. * gnu/packages/python-xyz.scm (python-openpyxl): Update to 2.6.2. --- gnu/packages/python-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9d661411c4..330c784848 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -889,7 +889,7 @@ of @code{xmlfile}.") (define-public python-openpyxl (package (name "python-openpyxl") - (version "2.6.0") + (version "2.6.2") (source (origin ;; We use the upstream repository, as the tests are not included in the @@ -900,8 +900,7 @@ of @code{xmlfile}.") (changeset version))) (file-name (string-append name "-" version "-checkout")) (sha256 - (base32 - "1x47ngn7ybaqdbvg90c8h2x0j6yfdfj25gjfinp2w5rf62gsany7")))) + (base32 "1qhij6kcvdxqjy4g6193nsv4q7fy8n4fwyd3c2z047idlm6s3j4w")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From fa9d14ac50cf946e94caa244c25e0b2ec16b0e13 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Apr 2019 00:47:38 +0200 Subject: gnu: python-serpent: Update to 1.28. * gnu/packages/python-xyz.scm (python-serpent): Update to 1.28. [native-inputs]: Add python-attrs & python-pytz. --- gnu/packages/python-xyz.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 330c784848..6eb4ba1886 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -615,15 +615,17 @@ version identifier.") (define-public python-serpent (package (name "python-serpent") - (version "1.27") + (version "1.28") (source (origin (method url-fetch) (uri (pypi-uri "serpent" version)) (sha256 - (base32 - "04p9dsrm5pv8vhk3flvih55kgvlzpi38hlaykdiakddmgwqw93bg")))) + (base32 "1arnckykpkvv2qrp49l1k7q5mr5pisswl0rvdx98x8wsl1n361pk")))) (build-system python-build-system) + (native-inputs + `(("python-attrs" ,python-attrs) + ("python-pytz" ,python-pytz))) (home-page "https://github.com/irmen/Serpent") (synopsis "Serializer for literal Python expressions") (description -- cgit 1.4.1 From 1d3c78036ff90ec94001abbeded2678dd76ef654 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Apr 2019 00:48:49 +0200 Subject: gnu: python-serpent: Tweak description. * gnu/packages/python-xyz.scm (python-serpent)[description]: Use @code{} and edit slightly. --- gnu/packages/python-xyz.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6eb4ba1886..99d9bfded7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -629,12 +629,13 @@ version identifier.") (home-page "https://github.com/irmen/Serpent") (synopsis "Serializer for literal Python expressions") (description - "Serpent provides ast.literal_eval() compatible object tree -serialization. It serializes an object tree into bytes (utf-8 encoded string) -that can be decoded and then passed as-is to ast.literal_eval() to rebuild it -as the original object tree. As such it is safe to send serpent data to other -machines over the network for instance (because only safe literals are -encoded).") + "Serpent provides @code{ast.literal_eval()}-compatible object tree +serialization. It serializes an object tree into bytes (an utf-8 encoded +string) that can be decoded and then passed as-is to @code{ast.literal_eval()} +to rebuild the original object tree. + +Because only safe literals are encoded, it is safe to send serpent data to +other machines, such as over the network.") (license license:expat))) (define-public python-setuptools -- cgit 1.4.1 From c60b15cc6200caa9f67a186548d974dbb83d19aa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Apr 2019 02:31:14 +0200 Subject: gnu: python-dill: Update to 0.2.9. * gnu/packages/python-xyz.scm (python-dill): Update to 0.2.9. --- gnu/packages/python-xyz.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 99d9bfded7..cbae299ea5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14650,16 +14650,15 @@ object-oriented library such as @code{scikit-learn}.") (define-public python-dill (package (name "python-dill") - (version "0.2.8.2") + (version "0.2.9") (source (origin (method url-fetch) (uri (pypi-uri "dill" version)) (sha256 - (base32 - "1cymzn9fxwdy33h21zkk4gqgzvd25110hh3zdqnvnwa3p52c4kb2")))) + (base32 "0vwqyi6hyz2r29zydc78dqymkbc5y7gia16xcdh215cikxph9mpn")))) (build-system python-build-system) - ;; FIXME: The check phase fails with "don't know how to make test". + ;; FIXME: The check phase fails with "don't know how to make test from: …". (arguments '(#:tests? #f)) (home-page "https://pypi.org/project/dill") (synopsis "Serialize all of Python") -- cgit 1.4.1