diff options
author | Ding Xiang Fei <dingxiangfei2009@gmail.com> | 2018-07-29 20:35:52 +0800 |
---|---|---|
committer | Ding Xiang Fei <dingxiangfei2009@gmail.com> | 2018-07-29 20:35:52 +0800 |
commit | 3a9d8a1ab43ed9f47e45c8b39d2a00e8ab29e4bd (patch) | |
tree | 67390286586ef4af0342cfaf82962cfb96da9435 /pkgs/development/python-modules/can/default.nix | |
parent | a998a49ee4f2f0461a93e9c9524654b845a8139e (diff) | |
parent | a2c6dbe370160ffea5537f64dda04489184c5ce1 (diff) | |
download | nixlib-3a9d8a1ab43ed9f47e45c8b39d2a00e8ab29e4bd.tar nixlib-3a9d8a1ab43ed9f47e45c8b39d2a00e8ab29e4bd.tar.gz nixlib-3a9d8a1ab43ed9f47e45c8b39d2a00e8ab29e4bd.tar.bz2 nixlib-3a9d8a1ab43ed9f47e45c8b39d2a00e8ab29e4bd.tar.lz nixlib-3a9d8a1ab43ed9f47e45c8b39d2a00e8ab29e4bd.tar.xz nixlib-3a9d8a1ab43ed9f47e45c8b39d2a00e8ab29e4bd.tar.zst nixlib-3a9d8a1ab43ed9f47e45c8b39d2a00e8ab29e4bd.zip |
Merge branch 'master' into cross-compiling-postgresql
Diffstat (limited to 'pkgs/development/python-modules/can/default.nix')
-rw-r--r-- | pkgs/development/python-modules/can/default.nix | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index f85f80ea2399..1072b33bc1b9 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -1,21 +1,30 @@ { lib , buildPythonPackage , fetchPypi +, wrapt , pyserial , nose -, mock }: +, mock +, pytest +, pytest-timeout }: buildPythonPackage rec { pname = "python-can"; - version = "2.1.0"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "4a5c01dd67feeda35f88e6c12ea14ac8cabd426b9be0cc5f9fd083fe90a9dbfc"; + sha256 = "b5e93b2ee32bdd597d9d908afe5171c402a04c9678ba47b60f33506738b1375b"; }; - propagatedBuildInputs = [ pyserial ]; - checkInputs = [ nose mock ]; + propagatedBuildInputs = [ wrapt pyserial ]; + checkInputs = [ nose mock pytest pytest-timeout ]; + + checkPhase = '' + pytest -k "not test_writer_and_reader \ + and not test_reader \ + and not test_socketcan_on_ci_server" + ''; meta = with lib; { homepage = https://github.com/hardbyte/python-can; |