From mboxrd@z Thu Jan 1 00:00:00 1970 From: Efraim Flashner Subject: Re: [PATCH 02/10] gnu: Update python-unittest2 to 0.6.0 Date: Tue, 3 May 2016 21:19:20 +0300 Message-ID: <20160503181920.GB16397@debian-netbook> References: <1461939663-5936-1-git-send-email-tipecaml@gmail.com> <1461939663-5936-3-git-send-email-tipecaml@gmail.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="2B/JsCI69OhZNC5r" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:48319) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1axevN-0001fb-IX for guix-devel@gnu.org; Tue, 03 May 2016 14:20:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1axev2-0003M4-8J for guix-devel@gnu.org; Tue, 03 May 2016 14:19:52 -0400 Received: from flashner.co.il ([178.62.234.194]:48150) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1axev1-0003B9-Ua for guix-devel@gnu.org; Tue, 03 May 2016 14:19:36 -0400 Content-Disposition: inline In-Reply-To: <1461939663-5936-3-git-send-email-tipecaml@gmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Cyril Roelandt Cc: guix-devel@gnu.org --2B/JsCI69OhZNC5r Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Apr 29, 2016 at 04:20:55PM +0200, Cyril Roelandt wrote: > * gnu/packages/python.scm (python-unittest2, python2-unittest2): Update to > 0.6.0. > * gnu/packages/patches/python-unittest2-skip-some-tests.patch: New file. > * gnu/local.mk: Add it here. > --- > gnu/local.mk | 1 + > .../patches/python-unittest2-skip-some-tests.patch | 18 +++++++++++++ > gnu/packages/python.scm | 31 +++++++---------= ------ > 3 files changed, 29 insertions(+), 21 deletions(-) > create mode 100644 gnu/packages/patches/python-unittest2-skip-some-tests= =2Epatch >=20 > diff --git a/gnu/local.mk b/gnu/local.mk > index 9e31ef9..cf3df7d 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -705,6 +705,7 @@ dist_patch_DATA =3D \ > gnu/packages/patches/python-paste-remove-timing-test.patch \ > gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.pat= ch \ > gnu/packages/patches/python-pandas-fix-tslib-test-failure.patch \ > + gnu/packages/patches/python-unittest2-skip-some-tests.patch \ > gnu/packages/patches/qemu-CVE-2015-8558.patch \ > gnu/packages/patches/qemu-CVE-2015-8567.patch \ > gnu/packages/patches/qemu-CVE-2015-8613.patch \ > diff --git a/gnu/packages/patches/python-unittest2-skip-some-tests.patch = b/gnu/packages/patches/python-unittest2-skip-some-tests.patch > new file mode 100644 > index 0000000..1902b01 > --- /dev/null > +++ b/gnu/packages/patches/python-unittest2-skip-some-tests.patch > @@ -0,0 +1,18 @@ > +--- a/unittest2/test/test_break.py 17:48:01.095139905 +0200 > ++++ b/unittest2/test/test_break.py 2016-04-28 17:48:14.027043632 +0200 > +@@ -72,6 +72,7 @@ > + self.assertTrue(result.breakCaught) > +=20 > +=20 > ++ @unittest2.skip('Guix failure') > + def testSecondInterrupt(self): > + result =3D unittest2.TestResult() > + unittest2.installHandler() > +@@ -121,6 +122,7 @@ > + self.assertFalse(result3.shouldStop) > +=20 > +=20 > ++ @unittest2.skip('Guix failure') > + def testHandlerReplacedButCalled(self): > + # If our handler has been replaced (is no longer installed) but= is > + # called by the *new* handler, then it isn't safe to delay the > diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm > index 0d5753f..99d1d3e 100644 > --- a/gnu/packages/python.scm > +++ b/gnu/packages/python.scm > @@ -1462,17 +1462,22 @@ matching them against a list of media-ranges.") > (define-public python-unittest2 > (package > (name "python-unittest2") > - (version "0.5.1") > + (version "0.6.0") > (source > (origin > (method url-fetch) > (uri (string-append > - "https://pypi.python.org/packages/source/u/unittest2py3k/un= ittest2py3k-" > - version ".tar.gz")) > + "https://pypi.python.org/packages/0c/39/" > + "90bbe47ad985d5f6b1e7658ece6f6b0d1045e6a61ee851eef3c6c6bf6= c0d/" > + "unittest2-" version ".tar.gz")) > (sha256 > (base32 > - "00yl6lskygcrddx5zspkhr0ibgvpknl4678kkm6s626539grq93q")))) > + "0ph1bd7h24gsqzjx51pdh05cpsidrdk0mnydjah6p011s3rk6ic6")) > + ;; 2 unexplained failures that should be investigated > + (patches (search-patches "python-unittest2-skip-some-tests.patch"= )))) > (build-system python-build-system) > + (propagated-inputs > + `(("python-six" ,python-six))) > (inputs > `(("python-setuptools" ,python-setuptools))) > (home-page "http://pypi.python.org/pypi/unittest2") > @@ -1483,23 +1488,7 @@ standard library.") > (license psfl))) > =20 > (define-public python2-unittest2 > - (package (inherit python-unittest2) > - (name "python2-unittest2") > - (version "0.5.1") > - (source > - (origin > - (method url-fetch) > - (uri (string-append > - "https://pypi.python.org/packages/source/u/unittest2/unitte= st2-" > - version ".tar.gz")) > - (sha256 > - (base32 > - "0wbs4i4x3x7klr3v35ss6p9mcqz883i1xgcpkhvl7n2lyv6yhpda")))) > - (inputs > - `(("python2-setuptools" ,python2-setuptools))) > - (arguments > - `(#:python ,python-2 > - #:tests? #f)))) ; no setup.py test command > + (package-with-python2 python-unittest2)) > =20 > (define-public python-py > (package > --=20 > 2.6.2 >=20 python2-unittest2 had a different url before than the python- version. Is it all using the same source now? --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --2B/JsCI69OhZNC5r Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCgAGBQJXKOulAAoJEPTB05F+rO6TxgUP/1mk5xlrii9UxtsZp5SGPLLG 1G5JexUWDi6rB25fxseucFJG2jeFKMsGO6R3R7iCSc/juoy9zpu4QHG8boH17KeU dHbgzUMPkP/txx0Dn/gcQ9fSYZ1mtkv5UjNA39B2emHpWx3EbtWpAhI1eDLsae8j 0Jjzk5rAsW3N2q/L4oTAZ84ZthUcv1pFXXnPSMchAuq1wNXGCPsXt2yGznTaMylM O6Tk/6e057HV2NO+GiNB6125N6T2QWa+2R0mnFwXcRn9o+8DDYurZGwEcSWzdIV6 XYSkUDflsIzhyC8xpfZ2NLSOrndsfwO/LkhYqVy45Cc+OKhvKVJyqdfue/J8VYqJ XFMEBWxzdDcjya2RgeUjeDTkrXgyNt3CU8w2zTdfHdLBy/l6oNBt3cURQcVea6hN XqahkxsNxY+16Q809b6VVcnF/bgSR7jLHyy8vIRy0ggQwxwjrBUhj1iLHHyLeXaJ pSHpYbTrv6EuWnQPG3Vm7voy/iq6b4e8xK9/6rDOqxfrSlpNvN8yWFWPgitaHaBt wrPMa/f/xjeNJPPeJdUlumEmuiSuMK2n59KOGFNK72n51FbXNQxPL5m68B6Ebola 3pfhZ2KAvspee8NmyR8qwnlpWw0rF8dLhHoG3ARI2hDXgpyNXyfOK1MNiYQG5B/o d6bAkG+MqitSgx/P5/Zo =e/gH -----END PGP SIGNATURE----- --2B/JsCI69OhZNC5r--