From 34f82153758d5a65a48dd386eef07bbf4efc3174 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 22 Feb 2025 23:12:52 +0100 Subject: [PATCH] python312Packages.more-properties: cleanup & disable on python >= 3.13 --- .../more-properties/default.nix | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/more-properties/default.nix b/pkgs/development/python-modules/more-properties/default.nix index 53e79468c66b..0a62ed9c4ac2 100644 --- a/pkgs/development/python-modules/more-properties/default.nix +++ b/pkgs/development/python-modules/more-properties/default.nix @@ -1,37 +1,43 @@ { lib, buildPythonPackage, - pythonOlder, + pythonAtLeast, fetchFromGitHub, + setuptools, pytestCheckHook, }: buildPythonPackage rec { pname = "more-properties"; version = "1.1.1"; + pyproject = true; - # upstream requires >= 3.6 but only 3.7 includes dataclasses - disabled = pythonOlder "3.7"; - - format = "setuptools"; + # All tests are failing with: + # AssertionError: None != 'The type of the None singleton.' + disabled = pythonAtLeast "3.13"; src = fetchFromGitHub { owner = "madman-bob"; repo = "python-more-properties"; - rev = version; + tag = version; hash = "sha256-dKG97rw5IG19m7u3ZDBM2yGScL5cFaKBvGZxPVJaUTE="; }; postPatch = '' mv pypi_upload/setup.py . substituteInPlace setup.py \ - --replace "project_root = Path(__file__).parents[1]" "project_root = Path(__file__).parents[0]" - - # dataclasses is included in Python 3.7 - substituteInPlace requirements.txt \ - --replace dataclasses "" + --replace-fail "project_root = Path(__file__).parents[1]" "project_root = Path(__file__).parents[0]" ''; + build-system = [ + setuptools + ]; + + pythonRemoveDeps = [ + # dataclasses is included in Python since 3.7 + "dataclasses" + ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "more_properties" ];