diff --git a/pkgs/development/python-modules/canmatrix/default.nix b/pkgs/development/python-modules/canmatrix/default.nix index 372a8ed685fb..511afe5f353a 100644 --- a/pkgs/development/python-modules/canmatrix/default.nix +++ b/pkgs/development/python-modules/canmatrix/default.nix @@ -4,50 +4,39 @@ buildPythonPackage, click, fetchFromGitHub, - future, - importlib-metadata, ldfparser, lxml, openpyxl, + pytest-cov-stub, + pytest-timeout, pytestCheckHook, pythonOlder, pyyaml, setuptools, - six, - versioneer, xlrd, xlwt, }: buildPythonPackage rec { pname = "canmatrix"; - version = "1.0"; + version = "1.2"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "ebroecker"; repo = "canmatrix"; tag = version; - hash = "sha256-UUJnLVt+uOj8Eav162btprkUeTemItGrSnBBB9UhJJI="; + hash = "sha256-PfegsFha7ernSqnMeaDoLf1jLx1CiOoiYi34dESEgBY="; }; - postPatch = '' - # Remove vendorized versioneer.py - rm versioneer.py - ''; - build-system = [ setuptools ]; - nativeBuildInputs = [ versioneer ]; - dependencies = [ attrs click - future - six - ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; optional-dependencies = { arxml = [ lxml ]; @@ -64,12 +53,15 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + pytest-cov-stub + pytest-timeout pytestCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); pytestFlagsArray = [ # long_envvar_name_imports requires stable key value pair ordering "-s src/canmatrix" + "tests/" ]; disabledTests = [ "long_envvar_name_imports" ];