Merge branch 'master' into staging

This commit is contained in:
Marius Bakke 2018-03-08 21:21:05 +01:00
commit d8fa1890c7
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
50 changed files with 939 additions and 347 deletions

View file

@ -5875,6 +5875,7 @@ reading and writing MessagePack data.")
(define-public python-msgpack-transitional
(package
(inherit python-msgpack)
(name "python-msgpack-transitional")
(arguments
(substitute-keyword-arguments (package-arguments python-msgpack)
((#:phases phases)
@ -10408,14 +10409,14 @@ convering text with ANSI color codes to HTML or LaTeX.")
(define-public python-ddt
(package
(name "python-ddt")
(version "1.1.1")
(version "1.1.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ddt" version))
(sha256
(base32
"1c00ikkxr7lha97c81k938bzhgd4pbwamkjn0h4nkhr3xk00zp6n"))))
"1wqkmz0yhanly8sif5vb02p2iik7mwxwph8ywph2kbb8ws8szdpx"))))
(build-system python-build-system)
(native-inputs
`(("python-mock" ,python-mock)
@ -10426,8 +10427,9 @@ convering text with ANSI color codes to HTML or LaTeX.")
(home-page "https://github.com/txels/ddt")
(synopsis "Data-Driven Tests")
(description
"DDT (Data-Driven Tests) allows you to multiply one test case by running
it with different test data, and make it appear as multiple test cases.")
"Data-Driven Tests (@dfn{DDT}) allow you to multiply one test case by
running it with different test data, and make it appear as multiple test
cases.")
(license license:expat)))
(define-public python2-ddt