Re: [PATCH 02/10] gnu: Update python-unittest2 to 0.6.0

[Efraim Flashner]

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.patch
> 
> 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 =                                         
> \
>    gnu/packages/patches/python-paste-remove-timing-test.patch \
>    gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
>    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)
> + 
> + 
> ++    @unittest2.skip('Guix failure')
> +     def testSecondInterrupt(self):
> +         result = unittest2.TestResult()
> +         unittest2.installHandler()
> +@@ -121,6 +122,7 @@
> +         self.assertFalse(result3.shouldStop)
> + 
> + 
> ++    @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/unittest2py3k-";
> -             version ".tar.gz"))
> +              "https://pypi.python.org/packages/0c/39/";
> +              "90bbe47ad985d5f6b1e7658ece6f6b0d1045e6a61ee851eef3c6c6bf6c0d/"
> +              "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)))
>  
>  (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/unittest2-";
> -             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))
>  
>  (define-public python-py
>    (package
> -- 
> 2.6.2
> 

python2-unittest2 had a different url before than the python- version.
Is it all using the same source now?

-- 
Efraim Flashner   <address@hidden>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

signature.asc
Description: PGP signature