Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2018-11-24 10:44:50 +01:00
92 changed files with 1146 additions and 386 deletions

View File

@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchPypi
, cryptography, ecdsa
, pytestrunner, pytestcov, pytest }:
, pytestrunner, pytestcov, pytest_37 }:
buildPythonPackage rec {
pname = "PyJWT";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ cryptography ecdsa ];
checkInputs = [ pytestrunner pytestcov pytest ];
checkInputs = [ pytestrunner pytestcov pytest_37 ];
# pytest 3.9.0 changed behavior of deprecated_call, see release notes
postPatch = ''