From 5a222ebaee19f9c7055a4afae686faca747ba799 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 2 Mar 2019 19:18:15 +0100 Subject: gnu: python-dask: Update to 1.1.3. * gnu/packages/python-xyz.scm (python-dask): Update to 1.1.3. --- 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 dc5a020b11..f6c217f346 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14694,14 +14694,14 @@ (define-public python2-partd (define-public python-dask (package (name "python-dask") - (version "1.0.0") + (version "1.1.3") (source (origin (method url-fetch) (uri (pypi-uri "dask" version)) (sha256 (base32 - "1xwz8h020ipwav2p5gcq9pskya1cvzd6hjyvd06dvr3w5lxlmym1")))) + "03ykmq46q2hh7mn68vcxkgylybjaj3r0kfspaiymdmqmjzpjivr5")))) (build-system python-build-system) ;; A single test out of 5000+ fails. This test is marked as xfail when ;; pytest-xdist is used. -- cgit v1.2.3 From e7a53914f15fa0e86ec583b115aca9e4ff6c69a3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 4 Mar 2019 13:54:47 +0100 Subject: gnu: python-matplotlib-documentation: Fix build. * gnu/packages/python-xyz.scm (python-matplotlib-documentation) [native-inputs]: Add python-ipykernel; replace texlive with a texlive-union consisting of texlive-latex-amsfonts, texlive-latex-amsmath, texlive-latex-enumitem, texlive-latex-expdlist, texlive-latex-preview, texlive-latex-type1cm, texlive-latex-ucs, texlive-generic-pdftex, texlive-fonts-amsfonts, texlive-fonts-ec, texlive-fonts-adobe-times, and texlive-fonts-txfonts. [arguments]: Do not build PDF, remove PDF-related changes; patch to avoid dependency on network resources. --- gnu/packages/python-xyz.scm | 51 ++++++++++++++++++++++++++++++++------------- 1 file changed, 36 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 f6c217f346..09c7e2db38 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3537,9 +3537,24 @@ (define-public python-matplotlib-documentation ("python-sphinx-gallery" ,python-sphinx-gallery) ("python-numpydoc" ,python-numpydoc) ("python-ipython" ,python-ipython) + ("python-ipykernel" ,python-ipykernel) ("python-mock" ,python-mock) ("graphviz" ,graphviz) - ("texlive" ,texlive) + ("texlive" ,(texlive-union (list texlive-latex-amsfonts + texlive-latex-amsmath + texlive-latex-enumitem + texlive-latex-expdlist + texlive-latex-geometry + texlive-latex-preview + texlive-latex-type1cm + texlive-latex-ucs + + texlive-generic-pdftex + + texlive-fonts-amsfonts + texlive-fonts-ec + texlive-fonts-adobe-times + texlive-fonts-txfonts))) ("texinfo" ,texinfo) ,@(package-native-inputs python-matplotlib))) (arguments @@ -3549,15 +3564,24 @@ (define-public python-matplotlib-documentation (replace 'build (lambda _ (chdir "doc") - ;; Produce pdf in 'A4' format. + (setenv "PYTHONPATH" + (string-append (getenv "PYTHONPATH") + ":" (getcwd) "/../examples/units")) (substitute* "conf.py" - (("latex_paper_size = 'letter'") "") - ;; latex_paper_size is deprecated -> set paper size using - ;; latex_elements - (("latex_elements\\['pointsize'\\] = '11pt'" match) - ;; insert at a point where latex_elements{} is defined: - (string-append match "\nlatex_elements['papersize'] = 'a4paper'"))) - (invoke "make" "SPHINXBUILD=sphinx-build" "html" "latex" "texinfo"))) + ;; Don't use git. + (("^SHA = check_output.*") + (string-append "SHA = \"" ,version "\"\n")) + ;; Don't fetch intersphinx files from the Internet + (("^explicit_order_folders" m) + (string-append "intersphinx_mapping = {}\n" m)) + (("'sphinx.ext.intersphinx',") "") + ;; Disable URL embedding which requires internet access. + (("'https://docs.scipy.org/doc/numpy'") "None") + (("'https://docs.scipy.org/doc/scipy/reference'") "None")) + (invoke "make" + "SPHINXBUILD=sphinx-build" + "SPHINXOPTS=" ; don't abort on warnings + "html" "texinfo"))) (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((data (string-append (assoc-ref outputs "out") "/share")) @@ -3575,12 +3599,9 @@ (define-public python-matplotlib-documentation (string-append "@image{matplotlib-figures/" file))) (symlink (string-append html "/_images") "./matplotlib-figures") - (system* "makeinfo" "--no-split" - "-o" "matplotlib.info" "matplotlib.texi")) - (copy-file "build/texinfo/matplotlib.info" - (string-append info "/matplotlib.info")) - (copy-file "build/latex/Matplotlib.pdf" - (string-append doc "/Matplotlib.pdf"))) + (invoke "makeinfo" "--no-split" + "-o" "matplotlib.info" "matplotlib.texi")) + (install-file "build/texinfo/matplotlib.info" info)) #t))))) (home-page (package-home-page python-matplotlib)) (synopsis "Documentation for the python-matplotlib package") -- cgit v1.2.3 From c6a2fd24fcb956dfaf4d155b0fca0e4e9c5def6b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 2 Mar 2019 16:24:15 +0100 Subject: gnu: python-cython: Update to 0.29.6. * gnu/packages/python-xyz.scm (python-cython): Update to 0.29.6. [arguments]: Remove obsolete deletion. --- gnu/packages/python-xyz.scm | 7 ++----- 1 file changed, 2 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 09c7e2db38..6a20ba4b49 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2802,14 +2802,14 @@ (define-public python2-scikit-image (define-public python-cython (package (name "python-cython") - (version "0.29.5") + (version "0.29.6") (source (origin (method url-fetch) (uri (pypi-uri "Cython" version)) (sha256 (base32 - "1wfb68g115gmf3mv23w0hh972b0ll85gpb92ci28x6h997br0llx")))) + "1bp7cn0pp5qy63k9hbp4ka34fm01kvysh478phpkhr68npqk6pbc")))) (build-system python-build-system) ;; we need the full python package and not just the python-wrapper ;; because we need libpython3.3m.so @@ -2841,9 +2841,6 @@ (define-public python-cython (replace 'check (lambda _ - ;; The "with_outer_raising" test fails with Python 3.7. See - ;; https://github.com/cython/cython/issues/2454 - (delete-file "tests/run/generators_py.py") (invoke "python" "runtests.py" "-vv")))))) (home-page "http://cython.org/") (synopsis "C extensions for Python") -- cgit v1.2.3 From 6d3cff5acacecc240b1d86048e41df3ce26483a5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 20:18:54 +0100 Subject: gnu: python-pyparsing: Update to 2.3.1. * gnu/packages/python-xyz.scm (python-pyparsing): Update to 2.3.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 6a20ba4b49..020152b159 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3259,13 +3259,13 @@ (define-public python2-pygit2 (define-public python-pyparsing (package (name "python-pyparsing") - (version "2.2.1") + (version "2.3.1") (source (origin (method url-fetch) (uri (pypi-uri "pyparsing" version)) (sha256 - (base32 "06dgd0iilvf8m0ssmfpcbh8l6jf0zkp8adbb84llksg17crfx4zl")))) + (base32 "0yk6xl885b91dmlhlsap7x78hk2rdr879fln9anbq6k4ca42djb6")))) (build-system python-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3