Merge branch 'master' into staging

This commit is contained in:
Marius Bakke 2020-11-23 23:39:47 +01:00
commit 87a027243f
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
36 changed files with 1002 additions and 234 deletions

View file

@ -3111,6 +3111,19 @@ provide an easy-to-use Python interface for building OAuth1 and OAuth2 clients."
(define-public python2-cachecontrol
(package-with-python2 python-cachecontrol))
(define-public python-cachecontrol-0.11
(package
(inherit python-cachecontrol)
(name "python-cachecontrol")
(version "0.11.7")
(source
(origin
(method url-fetch)
(uri (pypi-uri "CacheControl" version))
(sha256
(base32
"07jsfhlbcwgqg6ayz8nznzaqg5rmxqblbzxz1qvg5wc44pcjjy4g"))))))
(define-public python-betamax
(package
(name "python-betamax")