[PATCH v2 0/5] Update Sphinx to 1.4.6

[PATCH v2 0/5] Update Sphinx to 1.4.6

[Danny Milosavljevic]

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.6.

 gnu/packages/python.scm | 111 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 102 insertions(+), 9 deletions(-)

[PATCH v2 1/5] gnu: Add python-snowballstemmer.

[Danny Milosavljevic]

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index cf86c71..d8cb7d1 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -10990,3 +10990,27 @@ 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)))

[PATCH v2 2/5] gnu: Add python-sphinx-cloud-sptheme.

[Danny Milosavljevic]

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index d8cb7d1..a56e335 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -11014,3 +11014,26 @@ focus on building massively scalable web applications.")
       "This package provides 16 stemmer algorithms (15 + Poerter English
 stemmer) generated from Snowball algorithms.")
     (license license:bsd-3)))
+
+(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)))

[PATCH v2 3/5] gnu: Add python-sphinx-alabaster-theme.

[Danny Milosavljevic]

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index a56e335..60f2d19 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -11037,3 +11037,23 @@ stemmer) generated from Snowball algorithms.")
     "This package contains the 'Cloud' theme for Sphinx and some
 related extensions.")
   (license license:bsd-3)))
+
+(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)))

[PATCH v2 4/5] gnu: Add python-imagesize.

[Danny Milosavljevic]

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 60f2d19..84db4a6 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -11057,3 +11057,24 @@ related extensions.")
       "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)))
+
+(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)))

[PATCH v2 5/5] gnu: Update Sphinx to 1.4.6.

[Danny Milosavljevic]

* gnu/packages/python.scm (python-sphinx): Updated.
---
 gnu/packages/python.scm | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 84db4a6..8ce5371 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2802,22 +2802,27 @@ reStructuredText.")
 (define-public python-sphinx
   (package
     (name "python-sphinx")
-    (version "1.2.3")
+    (version "1.4.6")
     (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"))))
+         "1lvr39ab5sjp894jshk39xidlxw9vc735882cgcfr4dlm4546hwy"))))
     (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

Re: [PATCH v2 0/5] Update Sphinx to 1.4.6

[Hartmut Goebel]

Hi Danny,

thanks for the updated patchs.

I still have some remarks. Maybe I'm nitpicking, sorry.

-- 
Regards
Hartmut Goebel

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

Re: [PATCH v2 1/5] gnu: Add python-snowballstemmer.

[Hartmut Goebel]

Hi Danny,
> +    (synopsis
> +      "16 stemmer algorithms (15 + Poerter English stemmer)")
> +    (description
> +      "This package provides 16 stemmer algorithms (15 + Poerter English
> +stemmer) generated from Snowball algorithms.")

Sorry for not adding this comment the first time. For me this does not
help to understand what this package contains.

The projects readme says:

    Snowball stemming library collection for Python

    Original Snowball product created by Dr Martin Porter and Richard
    Boulton (Java porting). Original Snowball and my products are
    released under BSD license.


So perhaps this would be more expectational:

Snowball word stemming library collection for Python

This package provides 16 word stemmer algorithms generated from Snowball algorithms.
It includes the 15 original ones plus the Poerter English stemmer.
… some words about Snowball …

-- 
Regards
Hartmut Goebel

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

Re: [PATCH v2 4/5] gnu: Add python-imagesize.

[Hartmut Goebel]

Am 07.10.2016 um 17:13 schrieb Danny Milosavljevic:
> +    (synopsis
> +      "Gets image size of files in variaous formats in Python")

"sizes" (there are two of them: width and hight.

Sorry for nitpicking :-)

-- 
Regards
Hartmut Goebel

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

Re: [PATCH v2 5/5] gnu: Update Sphinx to 1.4.6.

[Hartmut Goebel]

Am 07.10.2016 um 17:13 schrieb Danny Milosavljevic:
> +    (native-inputs
> +     `(("python-simplejson" ,python-simplejson)))

Isn't node missing now?

And If I read the setup.py coerrectly, this is only required for PyPy:

        'simplejson',  # better:'test:platform_python_implementation=="PyPy"'


-- 
Regards
Hartmut Goebel

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

Re: [PATCH v2 5/5] gnu: Update Sphinx to 1.4.6.

[Danny Milosavljevic]

On Sat, 8 Oct 2016 15:31:46 +0200
Hartmut Goebel <h.goebel@crazy-compilers.com> wrote:
> Am 07.10.2016 um 17:13 schrieb Danny Milosavljevic:
> > +    (native-inputs
> > +     `(("python-simplejson" ,python-simplejson)))  
> 
> Isn't node missing now?

I don't know. I always test the stuff before sending - and it works. Should node be there?

Re: [PATCH v2 5/5] gnu: Update Sphinx to 1.4.6.

[Hartmut Goebel]

Am 08.10.2016 um 15:56 schrieb Danny Milosavljevic:
>>> > > +    (native-inputs
>>> > > +     `(("python-simplejson" ,python-simplejson)))  
>> > 
>> > Isn't node missing now?
> I don't know. I always test the stuff before sending - and it works. Should node be there?

Sorry, I meant "nose" (I'm in a hurry). nose ist listed as an
requierement, see my first comment:

These are required for building and testing only and thus have to be
native-inputs

        setuptools,
        'nose',
        'mock',  # it would be better for 'test:python_version in "2.6,2.7"'
        'simplejson',  # better:
'test:platform_python_implementation=="PyPy"'


-- 
Regards
Hartmut Goebel

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

Re: [PATCH v2 0/5] Update Sphinx to 1.4.6

[Leo Famulari]

On Fri, Oct 07, 2016 at 05:13:50PM +0200, Danny Milosavljevic wrote:
> 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.6.

Thanks for working on this! Already, some of our packages have broken
documentation due to our old Sphinx (vdirsyncer is one).

I started working on it a little while ago in the 'wip-python' branch,
but I decided to wait on that branch until after the next Guix release,
which will include Python 3.5 instead of 3.4.

My memory of that effort is hazy now, but I seem to remember that some
other Python package updates were required in order to make the new
Sphinx work correctly. I'll be happy if I'm wrong :)

Did you try rebuilding all the packages reported by `guix refresh -l
python-sphinx python2-sphinx?`

If they work, I think we could update Sphinx on master, since only ~162
packages would be rebuilt.

Re: [PATCH v2 0/5] Update Sphinx to 1.4.6

[Danny Milosavljevic]

Hi Leo,

On Wed, 12 Oct 2016 10:38:40 -0400
Leo Famulari <leo@famulari.name> wrote:
> My memory of that effort is hazy now, but I seem to remember that some
> other Python package updates were required in order to make the new
> Sphinx work correctly. I'll be happy if I'm wrong :)

I used guix git master and it worked to build xonsh docs there.

> Did you try rebuilding all the packages reported by `guix refresh -l
> python-sphinx python2-sphinx?`

guix build `guix refresh -l python-sphinx python2-sphinx`, right?

I got lots of

  guix build: warning: deprecated NAME-VERSION syntax; use NAME@VERSION instead

from guix build.

Then it failed because I depend on Hartmut's Python buildsystem changes - which are missing in master. (I didn't set any property or fiddle with native-inputs python2-setuptools of any new python2 package in this patch series. I'll send a new patch series that works without Hartmut's buildsystem changes)