From a18259add71f4d79d2f414e260c10fcbeaaab039 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 Jan 2025 23:19:03 +0100 Subject: [PATCH 1/2] python312Packages.jsonconversion: relax numpy --- .../python-modules/jsonconversion/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/jsonconversion/default.nix b/pkgs/development/python-modules/jsonconversion/default.nix index 3dc4df890e424..0b1976b5e7856 100644 --- a/pkgs/development/python-modules/jsonconversion/default.nix +++ b/pkgs/development/python-modules/jsonconversion/default.nix @@ -2,9 +2,10 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, - pdm-backend, numpy, + pdm-backend, + pytestCheckHook, + pythonOlder, setuptools, }: @@ -13,6 +14,8 @@ buildPythonPackage rec { version = "1.0.1"; pyproject = true; + disabled = pythonOlder "3.11"; + src = fetchFromGitHub { owner = "DLR-RM"; repo = "python-jsonconversion"; @@ -20,15 +23,15 @@ buildPythonPackage rec { hash = "sha256-XmAQXu9YkkMUvpf/QVk4u1p8UyNfRb0NeoLxC1evCT4="; }; - build-system = [ - pdm-backend - ]; + build-system = [ pdm-backend ]; pythonRemoveDeps = [ "pytest-runner" "pytest" ]; + pythonRelaxDeps = [ "numpy" ]; + dependencies = [ numpy setuptools @@ -41,7 +44,8 @@ buildPythonPackage rec { meta = with lib; { description = "This python module helps converting arbitrary Python objects into JSON strings and back"; homepage = "https://github.com/DLR-RM/python-jsonconversion"; + changelog = "https://github.com/DLR-RM/python-jsonconversion/releases/tag/${version}"; license = licenses.bsd2; - maintainers = [ maintainers.terlar ]; + maintainers = with maintainers; [ terlar ]; }; } From 66de21965a6c8f9e91916a6f9aec5e6d86066dbe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 Jan 2025 23:19:28 +0100 Subject: [PATCH 2/2] python313Packages.jsonconversion: disable failing test on Python 3.13 --- pkgs/development/python-modules/jsonconversion/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/jsonconversion/default.nix b/pkgs/development/python-modules/jsonconversion/default.nix index 0b1976b5e7856..50bda6d368657 100644 --- a/pkgs/development/python-modules/jsonconversion/default.nix +++ b/pkgs/development/python-modules/jsonconversion/default.nix @@ -5,6 +5,7 @@ numpy, pdm-backend, pytestCheckHook, + pythonAtLeast, pythonOlder, setuptools, }: @@ -41,6 +42,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "jsonconversion" ]; + disabledTests = lib.optionals (pythonAtLeast "3.13") [ "test_dict" ]; + meta = with lib; { description = "This python module helps converting arbitrary Python objects into JSON strings and back"; homepage = "https://github.com/DLR-RM/python-jsonconversion";