From f7db07068e77b8c6fe1094b11fa31d8d5880105d Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 18:46:39 +0900 Subject: [PATCH 1/2] python312Packages.pydsdl: 1.18.0 -> 1.22.0 Diff: https://github.com/OpenCyphal/pydsdl/compare/refs/tags/1.18.0...1.22.0 --- pkgs/development/python-modules/pydsdl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydsdl/default.nix b/pkgs/development/python-modules/pydsdl/default.nix index d74657c16784..ac444df89012 100644 --- a/pkgs/development/python-modules/pydsdl/default.nix +++ b/pkgs/development/python-modules/pydsdl/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pydsdl"; - version = "1.18.0"; + version = "1.22.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "OpenCyphal"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-sn7KoJmJbr7Y+N9PAXyhJnts/hW+Gi06nrHj5VIDZMU="; + hash = "sha256-Q6Zt7qiFZvTK2pF4nWfHbjwQHZffzKOad6X/HQ94EUo="; }; # allow for writable directory for darwin From e0d5144abc203c7b17925910f81c7c8d354bb23e Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 3 Nov 2024 13:19:56 +0900 Subject: [PATCH 2/2] python312Packages.pydsdl: refactor --- .../python-modules/pydsdl/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pydsdl/default.nix b/pkgs/development/python-modules/pydsdl/default.nix index ac444df89012..c7351b52fb52 100644 --- a/pkgs/development/python-modules/pydsdl/default.nix +++ b/pkgs/development/python-modules/pydsdl/default.nix @@ -2,33 +2,35 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, + setuptools, + pytestCheckHook, }: buildPythonPackage rec { pname = "pydsdl"; version = "1.22.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchFromGitHub { owner = "OpenCyphal"; - repo = pname; + repo = "pydsdl"; rev = "refs/tags/${version}"; hash = "sha256-Q6Zt7qiFZvTK2pF4nWfHbjwQHZffzKOad6X/HQ94EUo="; }; + build-system = [ setuptools ]; + # allow for writable directory for darwin preBuild = '' export HOME=$TMPDIR ''; - # Module doesn't contain tests - doCheck = false; - pythonImportsCheck = [ "pydsdl" ]; + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "pydsdl/_test.py" ]; + meta = with lib; { description = "Library to process Cyphal DSDL"; longDescription = ''