From d110bb06c516646eb72e2ebd96d59e00e3eec7d1 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 20:31:41 +0900 Subject: [PATCH 1/2] python312Packages.zodbpickle: 4.1 -> 4.1.1 Changelog: https://github.com/zopefoundation/zodbpickle/blob/4.1.1/CHANGES.rst --- pkgs/development/python-modules/zodbpickle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index be3a8f85cb07..b42479db165b 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "zodbpickle"; - version = "4.1"; + version = "4.1.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-esg1awxi3HQA+b0mUyX2Fe7LJPFDWFnB4utEQ1ivt1c="; + hash = "sha256-38DJFe8Umd0GA5cPXBECxr1+t7asRkNLKabYQL8Cckg="; }; # fails.. From 6d68f2054b769a7db1fb1fcf8267fea312c817e4 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 20:45:44 +0900 Subject: [PATCH 2/2] python312Packages.zodbpickle: switch to pypa builder and enable tests --- .../python-modules/zodbpickle/default.nix | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index b42479db165b..6b0b0a97b584 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -3,12 +3,14 @@ buildPythonPackage, pythonOlder, fetchPypi, + setuptools, + pytestCheckHook, }: buildPythonPackage rec { pname = "zodbpickle"; version = "4.1.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -17,11 +19,25 @@ buildPythonPackage rec { hash = "sha256-38DJFe8Umd0GA5cPXBECxr1+t7asRkNLKabYQL8Cckg="; }; - # fails.. - doCheck = false; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "setuptools<74" "setuptools" + ''; + + build-system = [ setuptools ]; pythonImportsCheck = [ "zodbpickle" ]; + nativeCheckInputs = [ pytestCheckHook ]; + + # fails.. + disabledTests = [ + "test_dump" + "test_dumps" + "test_load" + "test_loads" + ]; + meta = with lib; { description = "Fork of Python's pickle module to work with ZODB"; homepage = "https://github.com/zopefoundation/zodbpickle";