From d41d3a27ab8d91ef97e5f6c6947817955cc66197 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 21 Feb 2024 09:07:11 +0100 Subject: [PATCH 1/2] python311Packages.pony: refactor --- pkgs/development/python-modules/pony/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix index 892cb0829baf..76dbc0968d39 100644 --- a/pkgs/development/python-modules/pony/default.nix +++ b/pkgs/development/python-modules/pony/default.nix @@ -4,22 +4,27 @@ , pytestCheckHook , pythonOlder , pythonAtLeast +, setuptools }: buildPythonPackage rec { pname = "pony"; version = "0.7.17"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "ponyorm"; - repo = pname; + repo = "pony"; rev = "refs/tags/v${version}"; hash = "sha256-wBqw+YHKlxYplgsYL1pbkusHyPfCaVPcH/Yku6WDYbE="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; @@ -36,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for advanced object-relational mapping"; homepage = "https://ponyorm.org/"; + changelog = "https://github.com/ponyorm/pony/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ d-goldin xvapx ]; }; From 8851403f8034e1d8fdcf0916a86f21360230348c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 21 Feb 2024 09:07:27 +0100 Subject: [PATCH 2/2] python311Packages.pony: disable failing tests --- pkgs/development/python-modules/pony/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix index 76dbc0968d39..46a4daffe625 100644 --- a/pkgs/development/python-modules/pony/default.nix +++ b/pkgs/development/python-modules/pony/default.nix @@ -32,6 +32,14 @@ buildPythonPackage rec { disabledTests = [ # Tests are outdated "test_method" + # https://github.com/ponyorm/pony/issues/704 + "test_composite_param" + "test_equal_json" + "test_equal_list" + "test_len" + "test_ne" + "test_nonzero" + "test_query" ]; pythonImportsCheck = [