From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: bug#25177: [PATCH v6] gnu: python-sphinx: Update to 1.4.8. Date: Fri, 13 Jan 2017 13:34:21 +0100 Message-ID: <8760lj5eb6.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> References: <20170105161431.9803-1-dannym@scratchpost.org> <878tqpjw93.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60909) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cS14U-0005sR-7y for bug-guix@gnu.org; Fri, 13 Jan 2017 07:35:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cS14Q-0006Cb-9o for bug-guix@gnu.org; Fri, 13 Jan 2017 07:35:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:36735) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cS14Q-0006CX-2s for bug-guix@gnu.org; Fri, 13 Jan 2017 07:35:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cS14P-0001yV-TL for bug-guix@gnu.org; Fri, 13 Jan 2017 07:35:01 -0500 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <878tqpjw93.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: Danny Milosavljevic , Leo Famulari Cc: 25177@debbugs.gnu.org --=-=-= Content-Type: text/plain Marius Bakke writes: > Danny Milosavljevic 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 $ $ 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 :-) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlh4yU0ACgkQoqBt8qM6 VPogcwf/bV9PTezlej3gI3nsThbruozF+Sb0+W0L0lEap+BJzkfL2yzbioiSfxD9 Q2drdqy4TaPPBBAoWcto+TSGCibdkSGWMKavEwXZN1tzDzFA7dwS6Sf4xQw960Hi PlFuJihGyn/lIjjLfQULQt/KwALdRaNO5e8wfX2lStJntGYPLUYj6zN7v5Zd5VdW eZHreMRy+SWL/6mZFNmWYX0gTH0XndzhHOLYIxhXv8Ra9dkjVCRWCBQvNEgCy32I RbkN6I0g0rkaDEOsKibEhdgzf5UrTKMaU+/aercThRquEBmFTNI/NvueO0yqP1Dm /U2i3kClLPQevZpyIZoK8MfjjVwfkA== =UvA+ -----END PGP SIGNATURE----- --=-=-=--