Merge master into staging-next

2020-11-09 14:33:52 +01:00
parent 099bb158f9 f77eb9bb4d
commit 20f001c01e
313 changed files with 7523 additions and 7431 deletions
@@ -39,7 +39,7 @@ pythonPackages.buildPythonApplication rec {
  checkInputs = with pythonPackages; [
    flake8
    mock
-    pytest
+    pytestCheckHook
    pytestcov
    requests
  ];