[WIP v3 0/5] Update Sphinx to 1.4.8

[WIP v3 0/5] Update Sphinx to 1.4.8

[Danny Milosavljevic]

This patchset updates Sphinx to 1.4.8. It has been tested unsuccessfully on branch "master" using:

$ guix build `guix refresh -l python-sphinx python2-sphinx`

It fails in python-matplotlib due to latex complaining at "\footnote[*]" in Matplotlib.tex:171. If I manually change it to "\footnote[1]" it works. The file Matplotlib.tex is generated by Sphinx.

Should "\footnote[*]" work in LaTeX? If not, how does it end up there?

Danny Milosavljevic (5):
  gnu: Add python-snowballstemmer.
  gnu: Add python-sphinx-cloud-sptheme.
  gnu: Add python-sphinx-alabaster-theme.
  gnu: Add python-imagesize.
  gnu: Update Sphinx to 1.4.9

 gnu/packages/python.scm | 149 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 138 insertions(+), 11 deletions(-)

[WIP v3 1/5] gnu: Add python-snowballstemmer.

[Danny Milosavljevic]

* gnu/packages/python.scm (python-snowballstemmer, python2-snowballstemmer): New variables.
---
 gnu/packages/python.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index a9fd8eb..20e01dd 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -11017,3 +11017,31 @@ with an associated set of resolve methods that know how to fetch data.")
 provide extendible implementations of common aspects of a cloud so that you can
 focus on building massively scalable web applications.")
     (license license:expat)))
+
+(define-public python-snowballstemmer
+  (package
+    (name "python-snowballstemmer")
+    (version "1.2.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "snowballstemmer" version))
+        (sha256
+          (base32
+            "0a0idq4y5frv7qsg2x62jd7rd272749xk4x99misf5rcifk2d7wi"))))
+    (build-system python-build-system)
+    (arguments
+     `(;; No tests exist
+       #:tests? #f))
+    (home-page
+      "https://github.com/shibukawa/snowball_py")
+    (synopsis
+      "16 stemmer algorithms (15 + Poerter English stemmer)")
+    (description
+      "This package provides 16 stemmer algorithms (15 + Poerter English
+stemmer) generated from Snowball algorithms.")
+    (license license:bsd-3)
+    (properties `((python2-variant . ,(delay python2-snowballstemmer))))))
+
+(define-public python2-snowballstemmer
+  (package-with-python2 (strip-python2-variant python-snowballstemmer)))

[WIP v3 2/5] gnu: Add python-sphinx-cloud-sptheme.

[Danny Milosavljevic]

* gnu/packages/python.scm (python-sphinx-cloud-sptheme, python2-sphinx-cloud-sptheme): New variables.
---
 gnu/packages/python.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 20e01dd..0948c9b 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -11045,3 +11045,30 @@ stemmer) generated from Snowball algorithms.")
 
 (define-public python2-snowballstemmer
   (package-with-python2 (strip-python2-variant python-snowballstemmer)))
+
+(define-public python-sphinx-cloud-sptheme
+  (package
+    (name "python-sphinx-cloud-sptheme")
+    (version "1.7.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "cloud_sptheme" version))
+        (sha256
+          (base32
+            "0zm9ap4p5dzln8f1m2immadaxv2xpg8jg4w53y52rhfl7pdb58vy"))))
+  (build-system python-build-system)
+  (native-inputs
+    `(("python-sphinx" ,python-sphinx)))
+  (home-page
+    "https://bitbucket.org/ecollins/cloud_sptheme")
+  (synopsis
+    "'Cloud' theme for Sphinx documenter")
+  (description
+    "This package contains the 'Cloud' theme for Sphinx and some
+related extensions.")
+  (license license:bsd-3)
+  (properties `((python2-variant . ,(delay python2-sphinx-cloud-sptheme))))))
+
+(define-public python2-sphinx-cloud-sptheme
+  (package-with-python2 (strip-python2-variant python-sphinx-cloud-sptheme)))

[WIP v3 3/5] gnu: Add python-sphinx-alabaster-theme.

[Danny Milosavljevic]

* gnu/packages/python.scm (python-sphinx-alabaster-theme-0.7, python2-sphinx-alabaster-theme-0.7): New variables.
---
 gnu/packages/python.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 0948c9b..d9dd467 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -11072,3 +11072,33 @@ related extensions.")
 
 (define-public python2-sphinx-cloud-sptheme
   (package-with-python2 (strip-python2-variant python-sphinx-cloud-sptheme)))
+
+(define-public python-sphinx-alabaster-theme-0.7
+  (package
+    (name "python-sphinx-alabaster-theme")
+    (version "0.7.9")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "alabaster" version))
+        (sha256
+          (base32
+            "027anxzcb951gjlcc43y3rbn9qrw36d16vj9wd2smv5410xx9bs7"))))
+    (build-system python-build-system)
+    (home-page "https://alabaster.readthedocs.io")
+    (synopsis
+      "A configurable sidebar-enabled Sphinx theme")
+    (description
+      "Alabaster is a visually (c)lean, responsive, configurable theme for
+the Sphinx documentation system.  It's the default theme of Sphinx.")
+    (license license:bsd-3)
+    (properties `((python2-variant .
+                   ,(delay python2-sphinx-alabaster-theme-0.7))))))
+
+(define-public python2-sphinx-alabaster-theme-0.7
+  (let ((base (package-with-python2 (strip-python2-variant
+                                     python-sphinx-alabaster-theme-0.7))))
+    (package
+      (inherit base)
+      (native-inputs `(("python2-setuptools" ,python2-setuptools)
+                       ,@(package-native-inputs base))))))

[WIP v3 4/5] gnu: Add python-imagesize.

[Danny Milosavljevic]

* gnu/packages/python.scm (python-imagesize, python2-imagesize): New variables.
---
 gnu/packages/python.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index d9dd467..6adedcd 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -11102,3 +11102,32 @@ the Sphinx documentation system.  It's the default theme of Sphinx.")
       (inherit base)
       (native-inputs `(("python2-setuptools" ,python2-setuptools)
                        ,@(package-native-inputs base))))))
+
+(define-public python-imagesize
+  (package
+    (name "python-imagesize")
+    (version "0.7.1")
+    (source
+      (origin
+      (method url-fetch)
+      (uri (pypi-uri "imagesize" version))
+      (sha256
+        (base32
+          "0qk07k0z4241lkzzjji7z4da04pcvg7bfc4xz1934zlqhwmwdcha"))))
+    (build-system python-build-system)
+    (home-page
+      "https://github.com/shibukawa/imagesize_py")
+    (synopsis
+      "Gets image size of files in variaous formats in Python")
+    (description
+      "This package allows determination of image size from
+PNG, JPEG, JPEG2000 and GIF files in pure Python.")
+    (license license:expat)
+    (properties `((python2-variant . ,(delay python2-imagesize))))))
+
+(define-public python2-imagesize
+  (let ((base (package-with-python2 (strip-python2-variant python-imagesize))))
+    (package
+      (inherit base)
+      (native-inputs `(("python2-setuptools" ,python2-setuptools)
+                       ,@(package-native-inputs base))))))

[WIP v3 5/5] gnu: Update Sphinx to 1.4.8

[Danny Milosavljevic]

* gnu/packages/python.scm (python-sphinx, python2-sphinx): Updated.
---
 gnu/packages/python.scm | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 6adedcd..a9d99df 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2802,31 +2802,44 @@ reStructuredText.")
 (define-public python-sphinx
   (package
     (name "python-sphinx")
-    (version "1.2.3")
+    (version "1.4.8")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append
-             "https://pypi.python.org/packages/source/S/Sphinx/Sphinx-"
-             version ".tar.gz"))
+       (uri (pypi-uri "Sphinx" version))
        (sha256
         (base32
-         "011xizm3jnmf4cvs5i6kgf6c5nn046h79i8j0vd0f27yw9j3p4wl"))))
+         "0zvh8wwhm6gy21rr0cg42znsy4zzv2mnsxxk9gmn5y1ycn7rgbs1"))))
     (build-system python-build-system)
-    (inputs
-     `(("python-setuptools" ,python-setuptools)
-       ("python-jinja2" ,python-jinja2)
+    (propagated-inputs
+     `(("python-imagesize" ,python-imagesize)
+       ("python-sphinx-alabaster-theme-0.7"
+        ,python-sphinx-alabaster-theme-0.7)
+       ("python-babel" ,python-babel)
+       ("python-snowballstemmer" ,python-snowballstemmer)
        ("python-docutils" ,python-docutils)
-       ("python-pygments" ,python-pygments)))
+       ("python-jinja2" ,python-jinja2)
+       ("python-pygments" ,python-pygments)
+       ("python-six" ,python-six)))
+    (native-inputs
+     `(("python-simplejson" ,python-simplejson)))
     (home-page "http://sphinx-doc.org/")
     (synopsis "Python documentation generator")
     (description "Sphinx is a tool that makes it easy to create documentation
 for Python projects or other documents consisting of multiple reStructuredText
 sources.")
-    (license license:bsd-3)))
+    (license license:bsd-3)
+    (properties `((python2-variant . ,(delay python2-sphinx))))))
 
 (define-public python2-sphinx
-  (package-with-python2 python-sphinx))
+  (let ((base (package-with-python2 (strip-python2-variant python-sphinx))))
+    (package
+      (inherit base)
+      (native-inputs `(("python2-mock" ,python2-mock)
+                       ("python2-setuptools" ,python2-setuptools)
+                       ,@(package-native-inputs base)))
+      (propagated-inputs `(("python2-pytz" ,python2-pytz)
+                       ,@(package-propagated-inputs base))))))
 
 (define-public python-sphinx-rtd-theme
   (package

Re: [WIP v3 0/5] Update Sphinx to 1.4.8

[Danny Milosavljevic]

Upstream issue: https://github.com/sphinx-doc/sphinx/issues/3044

Re: [WIP v3 0/5] Update Sphinx to 1.4.8

[Danny Milosavljevic]

On Thu, 13 Oct 2016 08:45:51 +0200
Danny Milosavljevic <dannym@scratchpost.org> wrote:
> Upstream issue: https://github.com/sphinx-doc/sphinx/issues/3044

There's a newer version of Matplotlib which has a reference cycle matplotlib <- ipython <- matplotlib. Sigh...

Re: [WIP v3 0/5] Update Sphinx to 1.4.8

[Danny Milosavljevic]

> There's a newer version of Matplotlib which has a reference cycle matplotlib <- ipython <- matplotlib. Sigh...

If I remove "ipython requires matplotlib" (according to matplotlib upstream it doesn't - at least they imply that), then still this remains:

python-numpy requires python-matplotlib
python-matplotlib requires python-numpy-bootstrap
python-matplotlib requires python-ipython
python-ipython requires python-numpy

Therefore, there's a cycle

python-ipython requires python-numpy requires python-matplotlib requires python-ipython

.

Re: [WIP v3 0/5] Update Sphinx to 1.4.8

[Hartmut Goebel]

Am 13.10.2016 um 23:16 schrieb Danny Milosavljevic:
> python-ipython requires python-numpy

You could use numpy-bootstrap here, too. The only difference between
numpy and numpy-bootstrap ist that the former includes the documentation.

Also if you look at the requirements [*], numpy is only used for running
the tests. Thus we could again build a package "ipython-bootstrap"
without the docs and untested.

[*] https://github.com/ipython/ipython/blob/5.1.0/setup.py#L181

BTW: Maybe it's worth moving ipython and with whole jupyter stuff into a
new .scm file. jupyther is becoming more and more language agnostic,
thus in the long run it may lead to trouble having ipython in
python-scm. (And may lead to a really big python.scm), See  the graphics
at http://jupyter.readthedocs.io/en/latest/projects/content-projects.html

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

Re: [WIP v3 0/5] Update Sphinx to 1.4.8

[Ludovic Courtès]

Hello Danny!

Danny Milosavljevic <dannym@scratchpost.org> skribis:

>> There's a newer version of Matplotlib which has a reference cycle matplotlib <- ipython <- matplotlib. Sigh...
>
> If I remove "ipython requires matplotlib" (according to matplotlib upstream it doesn't - at least they imply that), then still this remains:
>
> python-numpy requires python-matplotlib
> python-matplotlib requires python-numpy-bootstrap
> python-matplotlib requires python-ipython
> python-ipython requires python-numpy
>
> Therefore, there's a cycle
>
> python-ipython requires python-numpy requires python-matplotlib requires python-ipython
>
> .

What’s the status of this Sphinx patch series of yours?

  https://lists.gnu.org/archive/html/guix-devel/2016-10/msg00642.html

Should we piggy back it on the python-test branch that Leo and Marius
have been working on?

Thanks,
Ludo’.

Re: [WIP v3 0/5] Update Sphinx to 1.4.8

[Danny Milosavljevic]

Hi Ludo,

> What’s the status of this Sphinx patch series of yours?
> 
>   https://lists.gnu.org/archive/html/guix-devel/2016-10/msg00642.html

Ah, thanks for reminding me! Yeah, it should be easy to get it up and running now.

I'll post some patches to add packages required only by the newer Sphinx.

Later on I'll update Sphinx. I now know how to fix matplotlib 1.4.3 - it also requires a patch to replace two characters in the docs.