diff options
author | Mark H Weaver <mhw@netris.org> | 2018-04-10 00:42:22 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2018-04-10 00:42:22 -0400 |
commit | f89aa1521af69b0e1a1350c2380579788b0f8945 (patch) | |
tree | 5009cca687ac669ef846920877cbfb6fffdd9893 /gnu/packages/python.scm | |
parent | 169c658f7f286efae397fa3eda55b1c56fa92a01 (diff) | |
parent | 60e1de6d95bd32b4996c199708541781b8f828fd (diff) |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/python.scm')
-rw-r--r-- | gnu/packages/python.scm | 71 |
1 files changed, 58 insertions, 13 deletions
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 013758c6db..be93d430ff 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -48,7 +48,9 @@ ;;; Copyright © 2018 Ethan R. Jones <ethanrjones97@gmail.com ;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com> ;;; Copyright © 2018 Vijayalakshmi Vedantham <vijimay12@gmail.com> - +;;; Copyright © 2018 Mathieu Lirzin <mthl@gnu.org> +;;; Copyright © 2018 Adam Massmann <massmannak@gmail.com> +;;; ;;; This file is part of GNU Guix. ;;; ;;; GNU Guix is free software; you can redistribute it and/or modify it @@ -1382,9 +1384,9 @@ applications. dogtail scripts are written in Python and executed like any other Python program.") (license license:gpl2+))) -(define-public python2-empy +(define-public python-empy (package - (name "python2-empy") + (name "python-empy") (version "3.3") (source (origin (method url-fetch) @@ -1395,12 +1397,7 @@ other Python program.") "01g8mmkfnvjdmlhsihwyx56lrg7r5m5d2fg6mnxsvy6g0dnl69f6")))) (build-system python-build-system) (arguments - `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (zero? (system* "./test.sh"))))))) + `(#:tests? #f)) ;python2 only (home-page "http://www.alcyone.com/software/empy/") (synopsis "Templating system for Python") (description @@ -1417,6 +1414,9 @@ system is highly configurable via command line options and embedded commands.") (license license:lgpl2.1+))) +(define-public python2-empy + (package-with-python2 python-empy)) + (define-public python2-element-tree (package (name "python2-element-tree") @@ -8705,14 +8705,14 @@ to occurrences in strings and comments.") (define-public python-py3status (package (name "python-py3status") - (version "3.1") + (version "3.7") (source (origin (method url-fetch) (uri (pypi-uri "py3status" version)) (sha256 (base32 - "0i283z1pivmir61z8kbiycigc94l61v33ygzkhczf1ifq7cppyds")))) + "0shxcfz4wcczj0mhwp4w0dvwd2fdd9bgprq8slim1519iiqzgwhq")))) (build-system python-build-system) (inputs `(("file" ,file))) @@ -8725,8 +8725,8 @@ to occurrences in strings and comments.") (lambda* (#:key inputs #:allow-other-keys) (let ((file-path (assoc-ref inputs "file"))) (substitute* "py3status/parse_config.py" - (("check_output\\(\\['file'") - (string-append "check_output(['" file-path "/bin/file'"))) + (("\\['file', '-b'") + (string-append "['" file-path "/bin/file', '-b'"))) #t)))) #:tests? #f)) ; TODO: Requires many libraries not in Guix. (home-page "https://github.com/ultrabug/py3status") @@ -13205,3 +13205,48 @@ working with iterables.") (define-public python2-more-itertools (package-with-python2 python-more-itertools)) + +(define-public python-latexcodec + (package + (name "python-latexcodec") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "latexcodec" version)) + (sha256 + (base32 + "0zdd1gf24i83ykadx0y30n3001j43scqr2saql3vckk5c39dj1wn")))) + (build-system python-build-system) + (inputs + `(("python-six" ,python-six))) + (home-page "https://readthedocs.org/projects/latexcodec/") + (synopsis "Work with LaTeX code in Python") + (description "Lexer and codec to work with LaTeX code in Python.") + (license license:expat))) + +(define-public python-pybtex + (package + (name "python-pybtex") + (version "0.21") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pybtex" version)) + (sha256 + (base32 + "00300j8dn5pxq4ndxmfmbmycg2znawkqs49val2x6jlmfiy6r2mg")))) + (build-system python-build-system) + (native-inputs + `(("python-nose" ,python-nose))) + (inputs + `(("python-latexcodec" ,python-latexcodec) + ("python-pyyaml" ,python-pyyaml) + ("python-six" ,python-six))) + (arguments + `(#:test-target "nosetests")) + (home-page "https://pybtex.org/") + (synopsis "BibTeX-compatible bibliography processor") + (description "Pybtex is a BibTeX-compatible bibliography processor written +in Python. You can simply type pybtex instead of bibtex.") + (license license:expat))) |