From f76cf11ed9f2c6e921e3783d8ed2a33f1458c8eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Mar 2025 01:10:21 +0000 Subject: [PATCH 1/3] python312Packages.nethsm: 1.2.1 -> 1.3.0 --- pkgs/development/python-modules/nethsm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nethsm/default.nix b/pkgs/development/python-modules/nethsm/default.nix index 189bb4aa813b..5fabc4cf47e3 100644 --- a/pkgs/development/python-modules/nethsm/default.nix +++ b/pkgs/development/python-modules/nethsm/default.nix @@ -12,7 +12,7 @@ let pname = "nethsm"; - version = "1.2.1"; + version = "1.3.0"; in buildPythonPackage { @@ -21,7 +21,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-EPxGJFCGGl3p3yLlM7NH7xtEVS2woRigKJhL57A0gAE="; + hash = "sha256-F0jSlT/xM8xaQWfUp87p+2RY/8hG7vRq8/VJ4a5Fkhw="; }; propagatedBuildInputs = [ From bbf44b177afcfafc1ea67b24287051dccfd16893 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 23 Mar 2025 09:47:43 +0100 Subject: [PATCH 2/3] python312Packages.nethsm: refactor --- .../python-modules/nethsm/default.nix | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/nethsm/default.nix b/pkgs/development/python-modules/nethsm/default.nix index 5fabc4cf47e3..9adb0b7eb947 100644 --- a/pkgs/development/python-modules/nethsm/default.nix +++ b/pkgs/development/python-modules/nethsm/default.nix @@ -10,13 +10,9 @@ urllib3, }: -let +buildPythonPackage rec { pname = "nethsm"; version = "1.3.0"; -in - -buildPythonPackage { - inherit pname version; pyproject = true; src = fetchPypi { @@ -24,7 +20,11 @@ buildPythonPackage { hash = "sha256-F0jSlT/xM8xaQWfUp87p+2RY/8hG7vRq8/VJ4a5Fkhw="; }; - propagatedBuildInputs = [ + pythonRelaxDeps = true; + + build-system = [ flit-core ]; + + dependencies = [ certifi cryptography python-dateutil @@ -32,19 +32,13 @@ buildPythonPackage { urllib3 ]; - nativeBuildInputs = [ - flit-core - ]; - - pythonRelaxDeps = true; - pythonImportsCheck = [ "nethsm" ]; meta = with lib; { description = "Client-side Python SDK for NetHSM"; homepage = "https://github.com/Nitrokey/nethsm-sdk-py"; changelog = "https://github.com/Nitrokey/nethsm-sdk-py/releases/tag/v${version}"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ frogamic ]; }; } From d657ca34a31a9b41b1fc016ca212c6b461b414f6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 23 Mar 2025 09:59:02 +0100 Subject: [PATCH 3/3] python313Packages.nethsm: enable tests --- .../python-modules/nethsm/default.nix | 33 ++++++++++++++++--- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/nethsm/default.nix b/pkgs/development/python-modules/nethsm/default.nix index 9adb0b7eb947..64ab1608a406 100644 --- a/pkgs/development/python-modules/nethsm/default.nix +++ b/pkgs/development/python-modules/nethsm/default.nix @@ -1,10 +1,14 @@ { lib, buildPythonPackage, - fetchPypi, - flit-core, certifi, cryptography, + docker, + fetchFromGitHub, + flit-core, + podman, + pycryptodome, + pytestCheckHook, python-dateutil, typing-extensions, urllib3, @@ -15,9 +19,11 @@ buildPythonPackage rec { version = "1.3.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-F0jSlT/xM8xaQWfUp87p+2RY/8hG7vRq8/VJ4a5Fkhw="; + src = fetchFromGitHub { + owner = "Nitrokey"; + repo = "nethsm-sdk-py"; + tag = "v${version}"; + hash = "sha256-vH5YjS3VO5krCMVQFcEgDhJeCUzo9EzFnBxq+zPuZ68="; }; pythonRelaxDeps = true; @@ -32,8 +38,25 @@ buildPythonPackage rec { urllib3 ]; + nativeCheckInputs = [ + docker + podman + pycryptodome + pytestCheckHook + ]; + pythonImportsCheck = [ "nethsm" ]; + disabledTestPaths = [ + # Tests require a running Docker instance + "tests/test_nethsm_config.py" + "tests/test_nethsm_keys.py" + "tests/test_nethsm_namespaces.py" + "tests/test_nethsm_other.py" + "tests/test_nethsm_system.py" + "tests/test_nethsm_users.py" + ]; + meta = with lib; { description = "Client-side Python SDK for NetHSM"; homepage = "https://github.com/Nitrokey/nethsm-sdk-py";