bug#25177: [PATCH v6] gnu: python-sphinx: Update to 1.4.8.

bug#25177: [PATCH v6] gnu: python-sphinx: Update to 1.4.8.

[Marius Bakke]

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

Marius Bakke <mbakke@fastmail.com> writes:

> Danny Milosavljevic <dannym@scratchpost.org> writes:
>
>> * gnu/packages/python.scm (python-sphinx)[version]: Update to 1.4.8.
>>   [source]: Use pypi-uri.
>>   [propagated-inputs]: Add python-imagesize, python-sphinx-alabaster-theme,
>>   python-babel, python-snowballstemmer, python-six.
>>   [properties]: Add python2-variant.
>> (python2-sphinx)[native-inputs]: Add python2-mock.
>>   [propagated-inputs]: Add python2-pytz.
>
> LGTM, thanks! As per the prior discussion, it should be applied in the
> 'python-tests' branch. Since it requires some packages only present in
> 'master', it will have to wait until the remaining failures are fixed.
>
> Then we can merge master, add this patch and start a new evaluation.

Leo: I'm unable to reproduce the Hydra failures, so I decided to merge
master so we can restart this branch. However, Savannah refuses the push
for no good reason!

$ git reset --hard savannah/python-tests
$ git merge master
$ <fix two conflicts>
$ git push -v savannah python-tests
Pushing to mbakke@git.sv.gnu.org:/srv/git/guix.git
error: failed to push some refs to 'mbakke@git.sv.gnu.org:/srv/git/guix.git'

Any ideas? The merged branch is 687 commits ahead.

You can try the merge yourself, the local.mk conflict is easy and in
bioinformatics.scm you want to keep [arguments] and not [native-inputs].

I suppose we could rebase it and force-push, but it seems heavy-handed.

Danny: I cannot apply the sphinx update patch for some reason. Did you
use git-send-email? In any case, since you will have commit access soon,
can you please push it to the 'python-tests' branch once this merge is
resolved. Then we can start a new evaluation and hopefully do the last
round of fixes :-)

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

bug#25177: [PATCH v6] gnu: python-sphinx: Update to 1.4.8.

[Danny Milosavljevic]

Hi,

> Danny: I cannot apply the sphinx update patch for some reason. Did you
> use git-send-email? 

Yes. I also pulled from guix master and did "git am" with my patch-E-Mail from back then a moment ago - it applied fine.

>In any case, since you will have commit access soon,
> can you please push it to the 'python-tests' branch once this merge is
> resolved. Then we can start a new evaluation and hopefully do the last
> round of fixes :-)

Sure.

bug#25177: [PATCH v6] gnu: python-sphinx: Update to 1.4.8.

[Leo Famulari]

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

On Fri, Jan 13, 2017 at 01:34:21PM +0100, Marius Bakke wrote:
> Leo: I'm unable to reproduce the Hydra failures, so I decided to merge
> master so we can restart this branch. However, Savannah refuses the push
> for no good reason!
> 
> $ git reset --hard savannah/python-tests
> $ git merge master
> $ <fix two conflicts>
> $ git push -v savannah python-tests
> Pushing to mbakke@git.sv.gnu.org:/srv/git/guix.git
> error: failed to push some refs to 'mbakke@git.sv.gnu.org:/srv/git/guix.git'

I bet that you are using the new pre-push hook that verifies commit
signatures, and you're trying to push some commits that fail the
signature verification check.

Someone should add some error reporting to the hook.

> Any ideas? The merged branch is 687 commits ahead.
> 
> You can try the merge yourself, the local.mk conflict is easy and in
> bioinformatics.scm you want to keep [arguments] and not [native-inputs].

Done with the hook disabled.

> I suppose we could rebase it and force-push, but it seems heavy-handed.

IMO we should avoid it when possible; rebasing loses the original
signatures.

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

bug#25177: [PATCH v6] gnu: python-sphinx: Update to 1.4.8.

[Danny Milosavljevic]

Done on the python-tests branch as commit 9a8acd00da3ad44ac6ef423f3d9cba87645cc022.

Matplotlib will fail now.

bug#25177: [PATCH v6] gnu: python-sphinx: Update to 1.4.8.

[Danny Milosavljevic]

Hi,

I've fixed python-matplotlib locally. It builds fine now.

The fix itself would be:

+                 (substitute* "users/intro.rst"
+                   ;; Fix reST markup error (see <https://github.com/sphinx-doc/sphinx/issues/3044>)
+                   (("[[][*][]]") "[#]"))

However, I've also changed alist-cons* phase construction to modify-phases. That would make the patch look real scary.

So here is a weird patch created via "git diff -b" where you can actually see what's happening without all the noise caused by indentation changes:

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index c540d7b5a..a5220e05e 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3723,8 +3723,8 @@ transcendental functions).")
        ("texinfo" ,texinfo)))
     (arguments
      `(#:phases
-       (alist-cons-before
-        'build 'configure-environment
+       (modify-phases %standard-phases
+         (add-before 'build 'configure-environment
            (lambda* (#:key outputs inputs #:allow-other-keys)
              (let ((cairo (assoc-ref inputs "cairo"))
                    (gtk+ (assoc-ref inputs "gtk+")))
@@ -3740,9 +3740,8 @@ basedirlist = ~a,~a~%
  [rc_options]~%
 backend = TkAgg~%"
                            (assoc-ref inputs "tcl")
-                        (assoc-ref inputs "tk"))))))
-        (alist-cons-after
-         'install 'install-doc
+                           (assoc-ref inputs "tk")))))))
+         (add-after 'install 'install-doc
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let* ((data (string-append (assoc-ref outputs "doc") "/share"))
                     (doc (string-append data "/doc/" ,name "-" ,version))
@@ -3756,6 +3755,9 @@ backend = TkAgg~%"
                  (substitute* (find-files "." "conf\\.py")
                    (("latex_paper_size = 'letter'")
                     "latex_paper_size = 'a4'"))
+                 (substitute* "users/intro.rst"
+                   ;; Fix reST markup error (see <https://github.com/sphinx-doc/sphinx/issues/3044>)
+                   (("[[][*][]]") "[#]"))
                  (mkdir-p html)
                  (mkdir-p info)
                  ;; The doc recommends to run the 'html' target twice.
@@ -3777,8 +3779,7 @@ backend = TkAgg~%"
                  (copy-file "build/texinfo/matplotlib.info"
                             (string-append info "/matplotlib.info"))
                  (copy-file "build/latex/Matplotlib.pdf"
-                          (string-append doc "/Matplotlib.pdf")))))
-        %standard-phases))))
+                            (string-append doc "/Matplotlib.pdf")))))))))
     (home-page "http://matplotlib.org")
     (synopsis "2D plotting library for Python")
     (description

Should I split this into two commits - one for modify-phases and one for the actual change? Should I post them to the list? If so, should I mark that it's for python-tests somehow?

bug#25177: [PATCH v6] gnu: python-sphinx: Update to 1.4.8.

[Marius Bakke]

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

Danny Milosavljevic <dannym@scratchpost.org> writes:

> Hi,
>
> I've fixed python-matplotlib locally. It builds fine now.
>
> The fix itself would be:
>
> +                 (substitute* "users/intro.rst"
> +                   ;; Fix reST markup error (see <https://github.com/sphinx-doc/sphinx/issues/3044>)
> +                   (("[[][*][]]") "[#]"))
>
> However, I've also changed alist-cons* phase construction to modify-phases. That would make the patch look real scary.
>
> So here is a weird patch created via "git diff -b" where you can actually see what's happening without all the noise caused by indentation changes:
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index c540d7b5a..a5220e05e 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -3723,8 +3723,8 @@ transcendental functions).")
>         ("texinfo" ,texinfo)))
>      (arguments
>       `(#:phases
> -       (alist-cons-before
> -        'build 'configure-environment
> +       (modify-phases %standard-phases
> +         (add-before 'build 'configure-environment
>             (lambda* (#:key outputs inputs #:allow-other-keys)
>               (let ((cairo (assoc-ref inputs "cairo"))
>                     (gtk+ (assoc-ref inputs "gtk+")))
> @@ -3740,9 +3740,8 @@ basedirlist = ~a,~a~%
>   [rc_options]~%
>  backend = TkAgg~%"
>                             (assoc-ref inputs "tcl")
> -                        (assoc-ref inputs "tk"))))))
> -        (alist-cons-after
> -         'install 'install-doc
> +                           (assoc-ref inputs "tk")))))))
> +         (add-after 'install 'install-doc
>             (lambda* (#:key inputs outputs #:allow-other-keys)
>               (let* ((data (string-append (assoc-ref outputs "doc") "/share"))
>                      (doc (string-append data "/doc/" ,name "-" ,version))
> @@ -3756,6 +3755,9 @@ backend = TkAgg~%"
>                   (substitute* (find-files "." "conf\\.py")
>                     (("latex_paper_size = 'letter'")
>                      "latex_paper_size = 'a4'"))
> +                 (substitute* "users/intro.rst"
> +                   ;; Fix reST markup error (see <https://github.com/sphinx-doc/sphinx/issues/3044>)
> +                   (("[[][*][]]") "[#]"))
>                   (mkdir-p html)
>                   (mkdir-p info)
>                   ;; The doc recommends to run the 'html' target twice.
> @@ -3777,8 +3779,7 @@ backend = TkAgg~%"
>                   (copy-file "build/texinfo/matplotlib.info"
>                              (string-append info "/matplotlib.info"))
>                   (copy-file "build/latex/Matplotlib.pdf"
> -                          (string-append doc "/Matplotlib.pdf")))))
> -        %standard-phases))))
> +                            (string-append doc "/Matplotlib.pdf")))))))))
>      (home-page "http://matplotlib.org")
>      (synopsis "2D plotting library for Python")
>      (description
>
> Should I split this into two commits - one for modify-phases and one
> for the actual change?

Yes, please do! That's what we've done so far, try to 'git grep' for
modify-phases.

> Should I post them to the list? If so, should I mark that it's for
> python-tests somehow?

That's up to you. Typically cosmetic commits like changing to use
modify-phases are OK to just push, assuming it is followed up with a
more "meaty" commit with actual changes. Otherwise it will just cause
pointless rebuilds.

When you do change it to use modify-phases, please also check that
phases end on a #t. It should be added explicitly if the ending
statement has an unspecified return value :-)

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

bug#25177: [PATCH v6] gnu: python-sphinx: Update to 1.4.8.

[Marius Bakke]

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

Leo Famulari <leo@famulari.name> writes:

> On Fri, Jan 13, 2017 at 01:34:21PM +0100, Marius Bakke wrote:
>> Leo: I'm unable to reproduce the Hydra failures, so I decided to merge
>> master so we can restart this branch. However, Savannah refuses the push
>> for no good reason!
>> 
>> $ git reset --hard savannah/python-tests
>> $ git merge master
>> $ <fix two conflicts>
>> $ git push -v savannah python-tests
>> Pushing to mbakke@git.sv.gnu.org:/srv/git/guix.git
>> error: failed to push some refs to 'mbakke@git.sv.gnu.org:/srv/git/guix.git'
>
> I bet that you are using the new pre-push hook that verifies commit
> signatures, and you're trying to push some commits that fail the
> signature verification check.
>
> Someone should add some error reporting to the hook.
>
>> Any ideas? The merged branch is 687 commits ahead.
>> 
>> You can try the merge yourself, the local.mk conflict is easy and in
>> bioinformatics.scm you want to keep [arguments] and not [native-inputs].
>
> Done with the hook disabled.

Thank you for this! You are of course completely right, I had forgotten
about the hook already. I'll see if I can make it fail in a less
misleading way :-)

Can you start a new evaluation on Hydra or Cuirass, once the matplotlib
commit is in?

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

bug#25177: [PATCH v6] gnu: python-sphinx: Update to 1.4.8.

[Danny Milosavljevic]

Pushed it as 2 commits to python-tests.

bug#25177: [PATCH v6] gnu: python-sphinx: Update to 1.4.8.

[Leo Famulari]

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

On Sat, Jan 14, 2017 at 04:35:24PM +0100, Marius Bakke wrote:
> Leo Famulari <leo@famulari.name> writes:
> Can you start a new evaluation on Hydra or Cuirass, once the matplotlib
> commit is in?

Sure, but let's wait for more progress on the gnome-updates evaluation.

I'll try to remember to check tomorrow, but feel free to remind me :)

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

bug#25177: [PATCH v6] gnu: python-sphinx: Update to 1.4.8.

[Leo Famulari]

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

On Sat, Jan 14, 2017 at 04:35:24PM +0100, Marius Bakke wrote:
> Can you start a new evaluation on Hydra or Cuirass, once the matplotlib
> commit is in?

It's running:
https://hydra.gnu.org/eval/109444

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