Merge branch 'master' into staging

This commit is contained in:
Marius Bakke 2020-03-10 20:45:24 +01:00
commit 2d421c4f19
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
35 changed files with 292 additions and 181 deletions

View file

@ -2416,7 +2416,7 @@ e.g. filters, callbacks and errbacks can all be promises.")
;; raise RuntimeError("setuptools >= 41 required to build")
("python-setuptools" ,python-setuptools)
("python-setuptools-scm" ,python-setuptools-scm)))
(inputs
(propagated-inputs
`(("python-appdirs" ,python-appdirs)
("python-distlib" ,python-distlib)
("python-filelock" ,python-filelock)