[PATCH v4 0/1] Update Sphinx to 1.4.8.

[PATCH v4 0/1] Update Sphinx to 1.4.8.

[Danny Milosavljevic]

This patch updates Sphinx to 1.4.8.
Be careful with it since lots of packages depend on it.
It also requires the earlier Sphinx-preparation patchset I set.
It also requires a separate patch to matplotlib I'll send later.

Danny Milosavljevic (1):
  gnu: python-sphinx: Update to 1.4.8.

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

[PATCH v4 1/1] gnu: python-sphinx: Update to 1.4.8.

[Danny Milosavljevic]

* gnu/packages/python.scm (python-sphinx)[version]: Update to 1.4.8.
---
 gnu/packages/python.scm | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index d80296339..4e1a6b4a8 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2907,30 +2907,43 @@ 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)
     (propagated-inputs
-     `(("python-jinja2" ,python-jinja2)
+     `(("python-imagesize" ,python-imagesize)
+       ("python-sphinx-alabaster-theme"
+        ,python-sphinx-alabaster-theme)
+       ("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)
+                       ,@(package-native-inputs base)))
+      (propagated-inputs `(("python2-pytz" ,python2-pytz)
+                       ,@(package-propagated-inputs base))))))
 
 (define-public python-sphinx-rtd-theme
   (package

Re: [PATCH v4 1/1] gnu: python-sphinx: Update to 1.4.8.

[Hartmut Goebel]

Am 04.01.2017 um 21:54 schrieb Danny Milosavljevic:
> +    (native-inputs
> +     `(("python-simplejson" ,python-simplejson)))

I was wondering why this is a native-input only. Please add a comment
that this is required for tests only.

Also: Did you try without tis package? The comment in the setup.py.
leaves the impression that this is only needed on PyPy, see
<https://github.com/sphinx-doc/sphinx/blob/master/setup.py#L68>.

-- 
Regards
Hartmut Goebel

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

Re: [PATCH v4 1/1] gnu: python-sphinx: Update to 1.4.8.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 212 bytes --]

Danny Milosavljevic <dannym@scratchpost.org> writes:

> * gnu/packages/python.scm (python-sphinx)[version]: Update to 1.4.8.

Please also mention changes to inputs, source and other fields in the
commit message.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

Re: [PATCH v4 0/1] Update Sphinx to 1.4.8.

[Leo Famulari]

On Wed, Jan 04, 2017 at 09:54:42PM +0100, Danny Milosavljevic wrote:
> This patch updates Sphinx to 1.4.8.
> Be careful with it since lots of packages depend on it.
> It also requires the earlier Sphinx-preparation patchset I set.
> It also requires a separate patch to matplotlib I'll send later.

Okay, if the depend on each other, please submit them as a single patch
series.

I know this update has been pending for a long time...

Re: [PATCH v4 0/1] Update Sphinx to 1.4.8.

[Danny Milosavljevic]

On Wed, 4 Jan 2017 16:10:30 -0500
Leo Famulari <leo@famulari.name> wrote:

> On Wed, Jan 04, 2017 at 09:54:42PM +0100, Danny Milosavljevic wrote:
> > This patch updates Sphinx to 1.4.8.
> > Be careful with it since lots of packages depend on it.
> > It also requires the earlier Sphinx-preparation patchset I set.
> > It also requires a separate patch to matplotlib I'll send later.  
> 
> Okay, if the depend on each other, please submit them as a single patch
> series.

Hmm, I separated them so one can merge the preparations into python-updates and master and python-sphinx into python-updates (and not master) - otherwise next time around I'll have to do the preparations all over again.