[PATCH 0/5] Update Sphinx to 1.4.6

[PATCH 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-0.7.
  gnu: Add python-imagesize.
  gnu: Update Sphinx to 1.4.6.

 gnu/packages/python.scm | 106 +++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 101 insertions(+), 5 deletions(-)

[PATCH 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 2/5] gnu: Add python-sphinx-cloud-sptheme.

[Danny Milosavljevic]

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index d8cb7d1..73f0c05 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -11014,3 +11014,29 @@ 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-sphix-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)
+  (inputs
+    `(("python-sphinx" ,python-sphinx)))
+  (native-inputs
+    `(("python-docutils" ,python-docutils)
+      ("python-snowballstemmer" ,python-snowballstemmer)))
+  (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)))

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

[Hartmut Goebel]

[-- Attachment #1.1: Type: text/plain, Size: 1063 bytes --]

Am 07.10.2016 um 12:32 schrieb Danny Milosavljevic:
> +  (inputs
> +    `(("python-sphinx" ,python-sphinx)))

Even if this is listed as requirement, I would not add it here. This is
a theme, say an add-on for sphinx, thus I would sphinx to be installed
anyway. python-sphinx-alabaster-theme is a theme too, but does not
require sphinx (and can not, otherwise it would be circular).)

> +  (native-inputs
> +    `(("python-docutils" ,python-docutils)

Not required by this package, it is already provided by sphinx.

> +      ("python-snowballstemmer" ,python-snowballstemmer)))

I can't find snowballstemmer  in the code.

-- 
Schönen Gruß
Hartmut Goebel
Dipl.-Informatiker (univ), CISSP, CSSLP, ISO 27001 Lead Implementer
Information Security Management, Security Governance, Secure Software
Development

Goebel Consult, Landshut
http://www.goebel-consult.de

Blog: http://www.goebel-consult.de/blog/verschlusselte-mailingslisten
Kolumne:
http://www.cissp-gefluester.de/2011-09-kommerz-uber-recht-fdp-die-gefaellt-mir-partei



[-- Attachment #1.2: Type: text/html, Size: 2558 bytes --]

[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 2430 bytes --]

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

[Danny Milosavljevic]

Hi,

thanks for the review!

On Fri, 7 Oct 2016 12:58:51 +0200
Hartmut Goebel <h.goebel@goebel-consult.de> wrote:
> I can't find snowballstemmer  in the code.

PATCH 1/5

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

[Hartmut Goebel]

Am 07.10.2016 um 15:28 schrieb Danny Milosavljevic:
> Hi,
>
> thanks for the review!
>
> On Fri, 7 Oct 2016 12:58:51 +0200
> Hartmut Goebel <h.goebel@goebel-consult.de> wrote:
>> I can't find snowballstemmer  in the code.
> PATCH 1/5
>

Sorry, seams I've been too terse.

snowballstemmer is not listed as an requirement for cloud_sptheme, neither in setup.py, nor elsewhere. I did not even find this anywhere in the source.

-- 
Regards
Hartmut Goebel

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

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

[Danny Milosavljevic]

On Fri, 7 Oct 2016 12:58:51 +0200
Hartmut Goebel <h.goebel@goebel-consult.de> wrote:

> Am 07.10.2016 um 12:32 schrieb Danny Milosavljevic:
> > +  (inputs
> > +    `(("python-sphinx" ,python-sphinx)))  
> 
> Even if this is listed as requirement, I would not add it here. 

When I remove it the tests fail.

running test
Searching for sphinx>=1.2
Reading https://pypi.python.org/simple/sphinx/
Download error on https://pypi.python.org/simple/sphinx/: [Errno -2] Name or service not known -- Some packages may not be found!
Couldn't find index page for 'sphinx' (maybe misspelled?)
Scanning index of all packages (this may take a while)
Reading https://pypi.python.org/simple/
Download error on https://pypi.python.org/simple/: [Errno -2] Name or service not known -- Some packages may not be found!
No local packages or download links found for sphinx>=1.2
error: Could not find suitable distribution for Requirement.parse('sphinx>=1.2')
phase `check' failed after 1.1 seconds
builder for `/gnu/store/55ip9808y416r0rjmvqm53paybwfkksp-python-sphix-cloud-sptheme-1.7.1.drv' failed with exit code 1

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

[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 73f0c05..088cdb0 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -11040,3 +11040,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-0.7")
+    (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 Sphix.")
+    (license license:bsd-3)))

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

[Hartmut Goebel]

[-- Attachment #1.1: Type: text/plain, Size: 688 bytes --]

Am 07.10.2016 um 12:32 schrieb Danny Milosavljevic:
> +(define-public python-sphinx-alabaster-theme-0.7

Why do we need this exact version?

> +  (package
> +    (name "python-sphinx-alabaster-theme-0.7")

The version number is *never* put into the name.

-- 
Schönen Gruß
Hartmut Goebel
Dipl.-Informatiker (univ), CISSP, CSSLP, ISO 27001 Lead Implementer
Information Security Management, Security Governance, Secure Software
Development

Goebel Consult, Landshut
http://www.goebel-consult.de

Blog: http://www.goebel-consult.de/blog/verschlusselte-mailingslisten
Kolumne:
http://www.cissp-gefluester.de/2011-09-kommerz-uber-recht-fdp-die-gefaellt-mir-partei



[-- Attachment #1.2: Type: text/html, Size: 2002 bytes --]

[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 2430 bytes --]

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

[Danny Milosavljevic]

Hi,

On Fri, 7 Oct 2016 13:01:22 +0200
Hartmut Goebel <h.goebel@goebel-consult.de> wrote:

> Am 07.10.2016 um 12:32 schrieb Danny Milosavljevic:
> > +(define-public python-sphinx-alabaster-theme-0.7  

> Why do we need this exact version?

I don't know why - but we do, as you yourself wrote.

Hartmut Goebel wrote:
> These are required at run-time and thus need to be propagated-inputs:
> 
>     'alabaster>=0.7,<0.8',  

> > +  (package
> > +    (name "python-sphinx-alabaster-theme-0.7")  
> 
> The version number is *never* put into the name.

True, sorry.

[PATCH 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 088cdb0..157a544 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -11060,3 +11060,24 @@ related extensions.")
       "Alabaster is a visually (c)lean, responsive, configurable theme for
 the Sphinx documentation system.  It's the default theme of Sphix.")
     (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 from png/jpeg/jpeg2000/gif files in Python")
+    (description
+      "This package allows determination of image size from
+png/jpeg/jpeg2000/gif files in Python.")
+    (license license:expat)))

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

[Hartmut Goebel]

Am 07.10.2016 um 12:32 schrieb Danny Milosavljevic:
> +    (synopsis
> +      "Gets image size from png/jpeg/jpeg2000/gif files in Python")

This is hard to read (and repeated in the description). Please use just
"image files of various formats".

> +      "This package allows determination of image size from
> +png/jpeg/jpeg2000/gif files in Python.")

Use comma and space instead of /.

Please state that this is a pure Python package. I was wondering why
there are no inputs, but this really implements the lookup in pure Python.

Maybe simply write "in pure Python"

-- 
Regards
Hartmut Goebel

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

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

[Danny Milosavljevic]

* gnu/packages/python.scm (python-sphinx): Updated.
---
 gnu/packages/python.scm | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 157a544..da5b63d 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2802,17 +2802,22 @@ 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)
+    (native-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-six" ,python-six)))
     (inputs
      `(("python-setuptools" ,python-setuptools)
        ("python-jinja2" ,python-jinja2)

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

[Hartmut Goebel]

Am 07.10.2016 um 12:32 schrieb Danny Milosavljevic:
> +    (native-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-six" ,python-six)))
>      (inputs
>       `(("python-setuptools" ,python-setuptools)

These inputs are wrong (and already have been wrong). Please take the
change to correct the old ones, too.

These are required at run-time and thus need to be propagated-inputs:

    'six>=1.5',
    'Jinja2>=2.3',
    'Pygments>=2.0',
    'docutils>=0.11',
    'snowballstemmer>=1.1',
    'babel>=1.3,!=2.0',
    'alabaster>=0.7,<0.8',
    'imagesize',

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 0/5] Update Sphinx to 1.4.6

[Hartmut Goebel]

Am 07.10.2016 um 12:32 schrieb Danny Milosavljevic:
>   gnu: Add python-snowballstemmer.
>   gnu: Add python-sphinx-cloud-sptheme.
>   gnu: Add python-sphinx-alabaster-theme-0.7.
>   gnu: Add python-imagesize.
>   gnu: Update Sphinx to 1.4.6.

Thanks for these patches. I wrote some comments. Could you send updated
patchws please?

-- 
Regards
Hartmut Goebel

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