Re: [PATCH 02/10] gnu: Update python-unittest2 to 0.6.0
On Fri, May 06, 2016 at 03:28:39AM +0200, Cyril Roelandt wrote:
> On 04/30/2016 11:33 PM, Leo Famulari wrote:
> > As with python-cmd2, could you if setuptools is required for the
> > python-3 variant?
> >
>
> So, I applied the following patch:
>
>
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -1520,8 +1520,7 @@ matching them against a list of media-ranges.")
> (build-system python-build-system)
> (propagated-inputs
> `(("python-six" ,python-six)))
> -(inputs
> - `(("python-setuptools" ,python-setuptools)))
> +;(inputs `(("python-setuptools" ,python-setuptools)))
> (home-page "http://pypi.python.org/pypi/unittest2";)
> (synopsis "Python unit testing library")
> (description
> @@ -1530,7 +1529,12 @@ standard library.")
> (license psfl)))
I think you forgot to add a line like this one to the python-3 variant's
definition:
(properties `((python2-variant . ,(delay python2-unittest2
Can you check if everything works when you do that?
Re: [PATCH 02/10] gnu: Update python-unittest2 to 0.6.0
On 04/30/2016 11:33 PM, Leo Famulari wrote:
> As with python-cmd2, could you if setuptools is required for the
> python-3 variant?
>
So, I applied the following patch:
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1520,8 +1520,7 @@ matching them against a list of media-ranges.")
(build-system python-build-system)
(propagated-inputs
`(("python-six" ,python-six)))
-(inputs
- `(("python-setuptools" ,python-setuptools)))
+;(inputs `(("python-setuptools" ,python-setuptools)))
(home-page "http://pypi.python.org/pypi/unittest2";)
(synopsis "Python unit testing library")
(description
@@ -1530,7 +1529,12 @@ standard library.")
(license psfl)))
(define-public python2-unittest2
- (package-with-python2 python-unittest2))
+ ;(package-with-python2 python-unittest2))
+ (let ((base (package-with-python2 (strip-python2-variant
python-unittest2
+(package
+ (inherit base)
+ (native-inputs `(("python2-setuptools" ,python2-setuptools)
+ ,@(package-native-inputs base))
(define-public python-py
(package
I can still build python-unittest2 and python-barbicanclient:
$ ./pre-inst-env guix build python-unittest2
/gnu/store/kh4nbzvqv9ic535xls92q8j6p6iz30kk-python-unittest2-0.6.0
$ ./pre-inst-env guix build python-barbicanclient
/gnu/store/n3kas9l1ffcf84gdbx1sswzrm4cl93n6-python-barbicanclient-4.0.1
I can still build python2-unittest2:
$ ./pre-inst-env guix build python2-unittest2
/gnu/store/ld9l5y5hxs19d15babphp7mv1kxsak55-python2-unittest2-0.6.0
But I can no longer build python2-barbicanclient:
http://paste.debian.net/682000/
>> > - #:tests? #f ; no setup.py test command
> Disabling two tests is an improvment over this! Did you find anyone else
> on the net having trouble with these two tests?
Not really, I was quite happy with enabling most of them for Python2 and
did not look any further, since my main goal was packaging
python-barbicanclient.
Cyril.
Re: [PATCH 02/10] gnu: Update python-unittest2 to 0.6.0
On 05/03/2016 08:19 PM, Efraim Flashner wrote: > python2-unittest2 had a different url before than the python- version. > Is it all using the same source now? It seems to be working using the same source, so... :) Cyril. signature.asc Description: OpenPGP digital signature
Re: [PATCH 02/10] gnu: Update python-unittest2 to 0.6.0
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 000..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 אפרים פלשנר
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
Re: [PATCH 02/10] gnu: Update python-unittest2 to 0.6.0
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.
Can you mention that it's added to (dist_patch_DATA)?
> (inputs
> `(("python-setuptools" ,python-setuptools)))
As with python-cmd2, could you if setuptools is required for the
python-3 variant?
> - #:tests? #f ; no setup.py test command
Disabling two tests is an improvment over this! Did you find anyone else
on the net having trouble with these two tests?
[PATCH 02/10] gnu: Update python-unittest2 to 0.6.0
* 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 000..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
