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

login
register
mail settings
Submitter Danny Milosavljevic
Date Oct. 7, 2016, 3:13 p.m.
Message ID <20161007151355.8763-6-dannym@scratchpost.org>
Download mbox | patch
Permalink /patch/16348/
State New
Headers show

Comments

Danny Milosavljevic - Oct. 7, 2016, 3:13 p.m.
* gnu/packages/python.scm (python-sphinx): Updated.
---
 gnu/packages/python.scm | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)
Hartmut Goebel - Oct. 8, 2016, 1:31 p.m.
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"'
Danny Milosavljevic - Oct. 8, 2016, 1:56 p.m.
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?
Hartmut Goebel - Oct. 8, 2016, 2:40 p.m.
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"'

Patch

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