From 914bba28096c1b85e368537c02e9841258887acb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Jun 2019 19:41:21 +0200 Subject: gnu: docker-compose: Add required Python dependencies. * gnu/packages/python-xyz.scm (python-jsonschema-2.6): New old public variable. * gnu/packages/docker.scm (docker-compose)[inputs]: Add python-docker-pycreds and use python-jsonschema-2.6. --- gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a7c88e9187..284ecbd441 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1966,6 +1966,32 @@ between Julian dates and Gregorian dates.") `(("python2-functools32" ,python2-functools32) ,@(package-propagated-inputs jsonschema)))))) +;; This old version is still required by docker-compose as of 1.24.0. +(define-public python-jsonschema-2.6 + (package + (name "python-jsonschema") + (version "2.6.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "jsonschema" version)) + (sha256 + (base32 + "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check (lambda _ (invoke "nosetests")))))) + (native-inputs + `(("python-nose" ,python-nose) + ("python-vcversioner" ,python-vcversioner))) + (home-page "https://github.com/Julian/jsonschema") + (synopsis "Implementation of JSON Schema for Python") + (description + "Jsonschema is an implementation of JSON Schema for Python.") + (license license:expat) + (properties `((python2-variant . ,(delay python2-jsonschema)))))) + (define-public python-schema (package (name "python-schema") -- cgit v1.2.3 From 5cfc16320a870b5b006d65095564bf5188d4557a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Jun 2019 13:28:56 +0200 Subject: gnu: python-scipy: Update to 1.2.2. * gnu/packages/python-xyz.scm (python-scipy): Update to 1.2.2. --- 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 284ecbd441..3efd18a72b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3974,14 +3974,14 @@ operators such as union, intersection, and difference.") (define-public python-scipy (package (name "python-scipy") - (version "1.1.0") + (version "1.2.2") (source (origin (method url-fetch) (uri (pypi-uri "scipy" version)) (sha256 (base32 - "1lfg686w6vv2m2dfs8v9d0bf2i18z7wz5vgzjnkgmpr4hi0550w7")))) + "1cgvgin8fvckv96hjh3ikmwkra5rif51bdb75ifzf7xbil5iwcx4")))) (build-system python-build-system) (propagated-inputs `(("python-numpy" ,python-numpy) -- cgit v1.2.3 From dede052a2cb5f8e35ddb342c6d77b5784f46ed0b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 18 Jun 2019 14:13:48 +0200 Subject: gnu: Add python-backcall. * gnu/packages/python-xyz.scm (python-backcall): New variable. --- 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 3efd18a72b..28ed440c78 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5062,6 +5062,28 @@ installing @code{kernelspec}s for use with Jupyter frontends.") (description "The package provides a PARI/GP kernel for Jupyter.") (license license:gpl3+))) +(define-public python-backcall + (package + (name "python-backcall") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "backcall" version)) + (sha256 + (base32 + "1r01dqch3f8fdj3n6fviw8hxqrs6w5v0qw4izmvqzry1w9dxiv1q")))) + (build-system python-build-system) + (home-page "https://github.com/takluyver/backcall/") + (synopsis "Specifications for callback functions passed in to an API") + (description + "If your code lets other people supply callback functions, it's important +to specify the function signature you expect, and check that functions support +that. Adding extra parameters later would break other peoples code unless +you're careful. The @code{backcall} package provides a way of specifying the +callback signature using a prototype function.") + (license license:bsd-3))) + ;; This is the latest release of the LTS version of ipython with support for ;; Python 2.7 and Python 3.x. Later non-LTS versions starting from 6.0 have ;; dropped support for Python 2.7. We may want to rename this package. -- cgit v1.2.3 From 0f3789477a79a4816ffdc8e1a232543909455d2c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 18 Jun 2019 14:14:07 +0200 Subject: gnu: python2-ipykernel: Split from python-ipykernel. * gnu/packages/python-xyz.scm (python2-ipykernel): Define without package-with-python2. --- 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 28ed440c78..a2abf36cbd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5034,8 +5034,39 @@ installing @code{kernelspec}s for use with Jupyter frontends.") "This package provides the IPython kernel for Jupyter.") (license license:bsd-3))) +;; Version 5.1.1 and above no longer support Python 2. (define-public python2-ipykernel - (package-with-python2 python-ipykernel)) + (package + (name "python2-ipykernel") + (version "5.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ipykernel" version)) + (sha256 + (base32 "0br95qhrd5k65g10djngiy27hs0642301hlf2q142i8djabvzh0g")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2 + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (setenv "HOME" "/tmp") + (invoke "pytest" "-v") + #t))))) + (propagated-inputs + `(("python2-ipython" ,python2-ipython) + ;; imported at runtime during connect + ("python2-jupyter-client" ,python2-jupyter-client))) + (native-inputs + `(("python2-pytest" ,python2-pytest) + ("python2-nose" ,python2-nose))) + (home-page "https://ipython.org") + (synopsis "IPython Kernel for Jupyter") + (description + "This package provides the IPython kernel for Jupyter.") + (license license:bsd-3))) (define-public python-pari-jupyter (package -- cgit v1.2.3 From 82110deadb52d5ae56eb177fde40fbe2caae95cf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 18 Jun 2019 14:14:47 +0200 Subject: gnu: python-ipykernel: Update to 5.1.1. * gnu/packages/python-xyz.scm (python-ipykernel): Update to 5.1.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 a2abf36cbd..0dd761cb3a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5005,13 +5005,13 @@ installing @code{kernelspec}s for use with Jupyter frontends.") (define-public python-ipykernel (package (name "python-ipykernel") - (version "5.1.0") + (version "5.1.1") (source (origin (method url-fetch) (uri (pypi-uri "ipykernel" version)) (sha256 - (base32 "0br95qhrd5k65g10djngiy27hs0642301hlf2q142i8djabvzh0g")))) + (base32 "173nm29g85w8cac3fg40b27qaq26g41wgg6qn79ql1hq4w2n5sgh")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 8b5f756ccbdd680926b5cce05d66c87b4042d0b4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 18 Jun 2019 14:15:19 +0200 Subject: gnu: python-ipython: Update to 7.5.0 * gnu/packages/python-xyz.scm (python2-ipython): Do not inherit from python-ipython. [outputs]: Remove separate "doc" output. [native-inputs]: Remove python-sphinx, python-sphinx-rtd-theme, texinfo, and the texlive-union consisting of texlive-fonts-amsfonts, texlive-fonts-ec, texlive-generic-ifxetex, texlive-generic-pdftex, texlive-latex-amsfonts, texlive-latex-capt-of, texlive-latex-cmap, texlive-latex-environ, texlive-latex-eqparbox, texlive-latex-etoolbox, texlive-latex-expdlist, texlive-latex-fancyhdr, texlive-latex-fancyvrb, texlive-latex-fncychap, texlive-latex-float, texlive-latex-framed, texlive-latex-geometry, texlive-latex-graphics, texlive-latex-hyperref, texlive-latex-mdwtools, texlive-latex-multirow, texlive-latex-oberdiek, texlive-latex-parskip, texlive-latex-preview, texlive-latex-tabulary, texlive-latex-threeparttable, texlive-latex-titlesec, texlive-latex-trimspaces, texlive-latex-ucs, texlive-latex-upquote, texlive-latex-url, texlive-latex-varwidth, and texlive-latex-wrapfig. [arguments]: Remove "install-doc" phase; rename "fix-tests" phase to "delete-broken-tests" and adjust. (python-ipython): Update to 7.5.0. [outputs]: Remove separate "doc" output. [propagated-inputs]: Add python-backcall and python-jedi; replace python-prompt-toolkit-1 with python-prompt-toolkit. [native-inputs]: Remove python-sphinx, python-sphinx-rtd-theme, texinfo, and the texlive-union consisting of texlive-fonts-amsfonts, texlive-fonts-ec, texlive-generic-ifxetex, texlive-generic-pdftex, texlive-latex-amsfonts, texlive-latex-capt-of, texlive-latex-cmap, texlive-latex-environ, texlive-latex-eqparbox, texlive-latex-etoolbox, texlive-latex-expdlist, texlive-latex-fancyhdr, texlive-latex-fancyvrb, texlive-latex-fncychap, texlive-latex-float, texlive-latex-framed, texlive-latex-geometry, texlive-latex-graphics, texlive-latex-hyperref, texlive-latex-mdwtools, texlive-latex-multirow, texlive-latex-oberdiek, texlive-latex-parskip, texlive-latex-preview, texlive-latex-tabulary, texlive-latex-threeparttable, texlive-latex-titlesec, texlive-latex-trimspaces, texlive-latex-ucs, texlive-latex-upquote, texlive-latex-url, texlive-latex-varwidth, and texlive-latex-wrapfig. [arguments]: Remove "install-doc" phase; simplify "fix-tests" phase. [properties]: Remove. (python-ipython-documentation): New variable. --- gnu/packages/python-xyz.scm | 245 +++++++++++++++++++++++++++----------------- 1 file changed, 150 insertions(+), 95 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0dd761cb3a..aca8a140e7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5117,10 +5117,10 @@ callback signature using a prototype function.") ;; This is the latest release of the LTS version of ipython with support for ;; Python 2.7 and Python 3.x. Later non-LTS versions starting from 6.0 have -;; dropped support for Python 2.7. We may want to rename this package. -(define-public python-ipython +;; dropped support for Python 2.7. +(define-public python2-ipython (package - (name "python-ipython") + (name "python2-ipython") (version "5.8.0") (source (origin @@ -5129,14 +5129,75 @@ callback signature using a prototype function.") (sha256 (base32 "01l93i4hspf0lvhmycvc8j378bslm9rw30mwfspsl6v1ayc69b2b")))) (build-system python-build-system) - (outputs '("out" "doc")) (propagated-inputs - `(("python-pyzmq" ,python-pyzmq) - ("python-prompt-toolkit" ,python-prompt-toolkit-1) + `(("python2-backports-shutil-get-terminal-size" + ,python2-backports-shutil-get-terminal-size) + ("python2-pathlib2" ,python2-pathlib2) + ("python2-pyzmq" ,python2-pyzmq) + ("python2-prompt-toolkit" ,python2-prompt-toolkit-1) + ("python2-terminado" ,python2-terminado) + ("python2-matplotlib" ,python2-matplotlib) + ("python2-numpy" ,python2-numpy) + ("python2-numpydoc" ,python2-numpydoc) + ("python2-jinja2" ,python2-jinja2) + ("python2-mistune" ,python2-mistune) + ("python2-pexpect" ,python2-pexpect) + ("python2-pickleshare" ,python2-pickleshare) + ("python2-simplegeneric" ,python2-simplegeneric) + ("python2-jsonschema" ,python2-jsonschema) + ("python2-traitlets" ,python2-traitlets) + ("python2-nbformat" ,python2-nbformat) + ("python2-pygments" ,python2-pygments))) + (inputs + `(("readline" ,readline) + ("which" ,which))) + (native-inputs + `(("graphviz" ,graphviz) + ("pkg-config" ,pkg-config) + ("python2-requests" ,python2-requests) ;; for tests + ("python2-testpath" ,python2-testpath) + ("python2-mock" ,python2-mock) + ("python2-nose" ,python2-nose))) + (arguments + `(#:python ,python-2 + #:phases + (modify-phases %standard-phases + (add-before 'check 'delete-broken-tests + (lambda* (#:key inputs #:allow-other-keys) + ;; These tests throw errors for unknown reasons. + (delete-file "IPython/core/tests/test_profile.py") + (delete-file "IPython/core/tests/test_interactiveshell.py") + (delete-file "IPython/core/tests/test_magic.py") + #t))))) + (home-page "https://ipython.org") + (synopsis "IPython is a tool for interactive computing in Python") + (description + "IPython provides a rich architecture for interactive computing with: +Powerful interactive shells, a browser-based notebook, support for interactive +data visualization, embeddable interpreters and tools for parallel +computing.") + (license license:bsd-3))) + +(define-public python-ipython + (package + (name "python-ipython") + (version "7.5.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ipython" version ".tar.gz")) + (sha256 + (base32 "09mbxq37mfn88xjnib7qfzaq9krr7gf1jxwy1p6mcjr254082h78")))) + (build-system python-build-system) + (propagated-inputs + `(("python-backcall" ,python-backcall) + ("python-pyzmq" ,python-pyzmq) + ("python-prompt-toolkit" ,python-prompt-toolkit) ("python-terminado" ,python-terminado) ("python-matplotlib" ,python-matplotlib) ("python-numpy" ,python-numpy) ("python-numpydoc" ,python-numpydoc) + ("python-jedi" ,python-jedi) ("python-jinja2" ,python-jinja2) ("python-mistune" ,python-mistune) ("python-pexpect" ,python-pexpect) @@ -5154,74 +5215,10 @@ callback signature using a prototype function.") ("pkg-config" ,pkg-config) ("python-requests" ,python-requests) ;; for tests ("python-testpath" ,python-testpath) - ("python-nose" ,python-nose) - ("python-sphinx" ,python-sphinx) - ("python-shpinx-rtd-theme" ,python-sphinx-rtd-theme) - ;; FIXME: It's possible that a smaller union would work just as well. - ("texlive" ,(texlive-union (list texlive-fonts-amsfonts - texlive-fonts-ec - texlive-generic-ifxetex - texlive-generic-pdftex - texlive-latex-amsfonts - texlive-latex-capt-of - texlive-latex-cmap - texlive-latex-environ - texlive-latex-eqparbox - texlive-latex-etoolbox - texlive-latex-expdlist - texlive-latex-fancyhdr - texlive-latex-fancyvrb - texlive-latex-fncychap - texlive-latex-float - texlive-latex-framed - texlive-latex-geometry - texlive-latex-graphics - texlive-latex-hyperref - texlive-latex-mdwtools - texlive-latex-multirow - texlive-latex-oberdiek - texlive-latex-parskip - texlive-latex-preview - texlive-latex-tabulary - texlive-latex-threeparttable - texlive-latex-titlesec - texlive-latex-trimspaces - texlive-latex-ucs - texlive-latex-upquote - texlive-latex-url - texlive-latex-varwidth - texlive-latex-wrapfig))) - ("texinfo" ,texinfo))) + ("python-nose" ,python-nose))) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'install 'install-doc - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((data (string-append (assoc-ref outputs "doc") "/share")) - (doc (string-append data "/doc/" ,name "-" ,version)) - (html (string-append doc "/html")) - (man1 (string-append data "/man/man1")) - (info (string-append data "/info")) - (examples (string-append doc "/examples")) - (python-arg (string-append "PYTHON=" (which "python")))) - (setenv "LANG" "en_US.utf8") - ;; Make installed package available for running the tests - (add-installed-pythonpath inputs outputs) - (with-directory-excursion "docs" - ;; FIXME: pdf fails to build - ;;(system* "make" "pdf" "PAPER=a4") - (system* "make" python-arg "html") - (system* "make" python-arg "info")) - (copy-recursively "docs/man" man1) - (copy-recursively "examples" examples) - (copy-recursively "docs/build/html" html) - ;; (copy-file "docs/build/latex/ipython.pdf" - ;; (string-append doc "/ipython.pdf")) - (mkdir-p info) - (copy-file "docs/build/texinfo/ipython.info" - (string-append info "/ipython.info")) - (copy-file "COPYING.rst" (string-append doc "/COPYING.rst"))) - #t)) ;; Tests can only be run after the library has been installed and not ;; within the source directory. (delete 'check) @@ -5244,19 +5241,11 @@ callback signature using a prototype function.") (substitute* "./IPython/core/tests/test_inputtransformer.py" (("#!/usr/bin/env python") (string-append "#!" (which "python")))) - ;; Disable 1 failing test - (substitute* "./IPython/core/tests/test_magic.py" - (("def test_dirops\\(\\):" all) - (string-append "@dec.skipif(True)\n" all))) ;; This test introduces a circular dependency on ipykernel ;; (which depends on ipython). (delete-file "IPython/core/tests/test_display.py") - ;; These tests throw errors for unknown reasons. - (delete-file "IPython/extensions/tests/test_storemagic.py") - (delete-file "IPython/core/tests/test_displayhook.py") + ;; AttributeError: module 'IPython.core' has no attribute 'formatters' (delete-file "IPython/core/tests/test_interactiveshell.py") - (delete-file "IPython/core/tests/test_pylabtools.py") - (delete-file "IPython/core/tests/test_paths.py") #t))))) (home-page "https://ipython.org") (synopsis "IPython is a tool for interactive computing in Python") @@ -5265,22 +5254,88 @@ callback signature using a prototype function.") Powerful interactive shells, a browser-based notebook, support for interactive data visualization, embeddable interpreters and tools for parallel computing.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-ipython)))))) + (license license:bsd-3))) -(define-public python2-ipython - (let ((ipython (package-with-python2 (strip-python2-variant python-ipython)))) - (package - (inherit ipython) - ;; FIXME: add pyreadline once available. - (propagated-inputs - `(("python2-backports-shutil-get-terminal-size" - ,python2-backports-shutil-get-terminal-size) - ("python2-pathlib2" ,python2-pathlib2) - ,@(package-propagated-inputs ipython))) - (native-inputs - `(("python2-mock" ,python2-mock) - ,@(package-native-inputs ipython)))))) +(define-public python-ipython-documentation + (package + (inherit python-ipython) + (name "python-ipython-documentation") + (version (package-version python-ipython)) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'build) + (delete 'check) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((data (string-append (assoc-ref outputs "out") "/share")) + (doc (string-append data "/doc/" ,name "-" ,version)) + (html (string-append doc "/html")) + (man1 (string-append data "/man/man1")) + (info (string-append data "/info")) + (examples (string-append doc "/examples")) + (python-arg (string-append "PYTHON=" (which "python")))) + (setenv "LANG" "en_US.utf8") + (with-directory-excursion "docs" + ;; FIXME: pdf fails to build + ;;(system* "make" "pdf" "PAPER=a4") + (system* "make" python-arg "html") + ;; FIXME: the generated texi file contains ^@^@, which trips + ;; up the parser. + ;; (system* "make" python-arg "info") + ) + (copy-recursively "docs/man" man1) + (copy-recursively "examples" examples) + (copy-recursively "docs/build/html" html) + ;; (copy-file "docs/build/latex/ipython.pdf" + ;; (string-append doc "/ipython.pdf")) + (mkdir-p info) + ;; (copy-file "docs/build/texinfo/ipython.info" + ;; (string-append info "/ipython.info")) + (copy-file "COPYING.rst" (string-append doc "/COPYING.rst"))) + #t))))) + (inputs + `(("python-ipython" ,python-ipython) + ("python-ipykernel" ,python-ipykernel))) + (native-inputs + `(("python-sphinx" ,python-sphinx) + ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme) + ;; FIXME: It's possible that a smaller union would work just as well. + ("texlive" ,(texlive-union (list texlive-fonts-amsfonts + texlive-fonts-ec + texlive-generic-ifxetex + texlive-generic-pdftex + texlive-latex-amsfonts + texlive-latex-capt-of + texlive-latex-cmap + texlive-latex-environ + texlive-latex-eqparbox + texlive-latex-etoolbox + texlive-latex-expdlist + texlive-latex-fancyhdr + texlive-latex-fancyvrb + texlive-latex-fncychap + texlive-latex-float + texlive-latex-framed + texlive-latex-geometry + texlive-latex-graphics + texlive-latex-hyperref + texlive-latex-mdwtools + texlive-latex-multirow + texlive-latex-needspace + texlive-latex-oberdiek + texlive-latex-parskip + texlive-latex-preview + texlive-latex-tabulary + texlive-latex-threeparttable + texlive-latex-titlesec + texlive-latex-trimspaces + texlive-latex-ucs + texlive-latex-upquote + texlive-latex-url + texlive-latex-varwidth + texlive-latex-wrapfig))) + ("texinfo" ,texinfo))))) (define-public python-urwid (package -- cgit v1.2.3 From 55dae98f737b641aaf6e0b73ed343ae3be47545d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 18 Jun 2019 14:48:36 +0200 Subject: gnu: Add python-matplotlib-venn. * gnu/packages/python-xyz.scm (python-matplotlib-venn): New variable. --- gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index aca8a140e7..be9c58bb98 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3941,6 +3941,32 @@ toolkits.") (define-public python2-matplotlib-documentation (package-with-python2 python-matplotlib-documentation)) +(define-public python-matplotlib-venn + (package + (name "python-matplotlib-venn") + (version "0.11.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "matplotlib-venn" version ".zip")) + (sha256 + (base32 + "13w3i1wih0mij08hrgppzg0g9z50y54rc28l6gdi1r5w45l7l0dy")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; tests are not included + (propagated-inputs + `(("python-matplotlib" ,python-matplotlib) + ("python-numpy" ,python-numpy) + ("python-scipy" ,python-scipy))) + (native-inputs + `(("unzip" ,unzip))) + (home-page "https://github.com/konstantint/matplotlib-venn") + (synopsis "Plot area-proportional Venn diagrams") + (description + "This package provides tools for plotting area-proportional two- and +three-way Venn diagrams in @code{matplotlib}.") + (license license:expat))) + (define-public python2-pysnptools (package (name "python2-pysnptools") -- cgit v1.2.3 From 7bcf827c1d1a99097bea2dd309bdd5338e8de34a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 16 May 2019 17:46:33 +0200 Subject: gnu: python-botocore: Update to 1.12.149. * gnu/packages/python-xyz.scm (python-botocore): Update to 1.12.149. [native-inputs]: Add python-urllib3. --- gnu/packages/python-xyz.scm | 55 +++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 27 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index be9c58bb98..2bf98222ae 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8428,34 +8428,35 @@ document.") (define-public python-botocore (package - (name "python-botocore") - (version "1.8.43") - (source - (origin - (method url-fetch) - (uri (pypi-uri "botocore" version)) - (sha256 - (base32 - "12cqpbnz3vfv41mp9admvciw7bc7hz57sjpqs2bxaw9wnfmbw5lg")))) - (build-system python-build-system) - (arguments - ;; FIXME: Many tests are failing. - '(#:tests? #f)) - (propagated-inputs - `(("python-dateutil" ,python-dateutil) - ("python-docutils" ,python-docutils) - ("python-jmespath" ,python-jmespath))) - (native-inputs - `(("python-mock" ,python-mock) - ("python-nose" ,python-nose) - ("behave" ,behave) - ("python-tox" ,python-tox) - ("python-wheel" ,python-wheel))) - (home-page "https://github.com/boto/botocore") - (synopsis "Low-level interface to AWS") - (description "Botocore is a Python library that provides a low-level + (name "python-botocore") + (version "1.12.149") + (source + (origin + (method url-fetch) + (uri (pypi-uri "botocore" version)) + (sha256 + (base32 + "12597f74khp3ngwr282cb949w0gcqj20rkfc3x275dijavyy5cmf")))) + (build-system python-build-system) + (arguments + ;; FIXME: Many tests are failing. + '(#:tests? #f)) + (propagated-inputs + `(("python-dateutil" ,python-dateutil) + ("python-docutils" ,python-docutils) + ("python-jmespath" ,python-jmespath))) + (native-inputs + `(("python-mock" ,python-mock) + ("python-nose" ,python-nose) + ("behave" ,behave) + ("python-tox" ,python-tox) + ("python-urllib3" ,python-urllib3) + ("python-wheel" ,python-wheel))) + (home-page "https://github.com/boto/botocore") + (synopsis "Low-level interface to AWS") + (description "Botocore is a Python library that provides a low-level interface to the Amazon Web Services (AWS) API.") - (license license:asl2.0))) + (license license:asl2.0))) (define-public python2-botocore (package-with-python2 python-botocore)) -- cgit v1.2.3 From 8e590c81539a79ec19bf91d3e5f8a2c4f9a659bb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 20 Jun 2019 13:12:23 +0200 Subject: gnu: python2-jupyter-console: Split from python-jupyter-console. * gnu/packages/python-xyz.scm (python2-jupyter-console): Implement without package-with-python2. --- 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 2bf98222ae..d3d3ef31d0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7593,7 +7593,32 @@ Jupyter kernels such as IJulia and IRKernel.") (license license:bsd-3))) (define-public python2-jupyter-console - (package-with-python2 python-jupyter-console)) + (package + (name "python2-jupyter-console") + (version "5.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "jupyter_console" version)) + (sha256 + (base32 + "1kam1qzgwr7srhm5r6aj90di5sws4bq0jmiw15452ddamb9yspal")))) + (build-system python-build-system) + ;; Tests only run in an TTY. + (arguments `(#:tests? #f)) + (propagated-inputs + `(("python2-ipykernel" ,python2-ipykernel) + ("python2-jupyter-client" ,python2-jupyter-client) + ("python2-prompt-toolkit" ,python2-prompt-toolkit-1) + ("python2-pygments" ,python2-pygments))) + (native-inputs + `(("python2-nose" ,python2-nose))) + (home-page "https://jupyter.org") + (synopsis "Jupyter terminal console") + (description "This package provides a terminal-based console frontend for +Jupyter kernels. It also allows for console-based interaction with non-Python +Jupyter kernels such as IJulia and IRKernel.") + (license license:bsd-3))) ;; The python-ipython and python-jupyter-console require each other. To get ;; the functionality in both packages working, strip down the -- cgit v1.2.3 From becb9cbfe1e2fb70da940e989f56be17abe31133 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 20 Jun 2019 13:13:00 +0200 Subject: gnu: python-jupyter-console: Update to 6.0.0. * gnu/packages/python-xyz.scm (python-jupyter-console): Update to 6.0.0. [arguments]: Enable tests. [propagated-inputs]: Replace python-prompt-toolkit-1 with python-prompt-toolkit. --- gnu/packages/python-xyz.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d3d3ef31d0..5e19cc9b5d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7567,21 +7567,19 @@ in the data.") (define-public python-jupyter-console (package (name "python-jupyter-console") - (version "5.2.0") + (version "6.0.0") (source (origin (method url-fetch) (uri (pypi-uri "jupyter_console" version)) (sha256 (base32 - "1kam1qzgwr7srhm5r6aj90di5sws4bq0jmiw15452ddamb9yspal")))) + "1xdjw11cppf1fxvwkw2bk13ckkwas3bdah8baingn9296mvfi31h")))) (build-system python-build-system) - ;; Tests only run in an TTY. - (arguments `(#:tests? #f)) (propagated-inputs `(("python-ipykernel" ,python-ipykernel) ("python-jupyter-client" ,python-jupyter-client) - ("python-prompt-toolkit" ,python-prompt-toolkit-1) + ("python-prompt-toolkit" ,python-prompt-toolkit) ("python-pygments" ,python-pygments))) (native-inputs `(("python-nose" ,python-nose))) -- cgit v1.2.3 From bd9d72067e1469a1530a4b04427f25e93b37caac Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 17 Jun 2019 18:26:21 +0200 Subject: gnu: python-unidecode: Update to 1.1.0. * gnu/packages/python-xyz.scm (python-unidecode): Update to 1.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 5e19cc9b5d..c329a2cfbb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2063,13 +2063,13 @@ cutting and pasting that code over and over.") (define-public python-unidecode (package (name "python-unidecode") - (version "1.0.23") + (version "1.1.0") (source (origin (method url-fetch) (uri (pypi-uri "Unidecode" version)) (sha256 (base32 - "1ysjbr3nqfqj97h8zyj3v9pya413vkv7a1mzml80w37xx15kb1cb")))) + "00pi0czzwvbf7djhkkjyvimj60wqdx0llbddzfnax650g9b8yscc")))) (build-system python-build-system) (home-page "https://pypi.python.org/pypi/Unidecode") (synopsis "ASCII transliterations of Unicode text") -- cgit v1.2.3