From 76453af3d1c7634bfabfe9268d9de77922df24a6 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 28 Jul 2024 20:32:35 +0200 Subject: [PATCH] python312Packages.pprintpp: drop nose dependency; change source --- .../python-modules/pprintpp/default.nix | 34 +++++-------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/pprintpp/default.nix b/pkgs/development/python-modules/pprintpp/default.nix index 904e067b6c0a..d791e77972b9 100644 --- a/pkgs/development/python-modules/pprintpp/default.nix +++ b/pkgs/development/python-modules/pprintpp/default.nix @@ -2,9 +2,7 @@ lib, buildPythonPackage, fetchpatch, - fetchPypi, - nose, - parameterized, + fetchFromGitHub, pytestCheckHook, pythonOlder, setuptools, @@ -12,22 +10,19 @@ buildPythonPackage rec { pname = "pprintpp"; - version = "0.4.0"; + version = "0.4.0-unstable-2022-05-31"; pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-6oJhCOLH9J3G1mx1KXPD/JdJFCp5jWslTh4wHP28ZAM="; + src = fetchFromGitHub { + owner = "joaonc"; + repo = "pprintpp2"; + rev = "303f0652c9420f2cf0a0f4fe1907377508a17b3d"; # no tags + hash = "sha256-rjOf38m5mzIyJ3aVrD0+WQuzIyFjfa/4zmpFGGhF2hs="; }; patches = [ - # Replace nose-parameterized with parameterized, https://github.com/wolever/pprintpp/pull/21 - (fetchpatch { - url = "https://github.com/wolever/pprintpp/commit/873217674cc824b4c1cfdad4867c560c60e8d806.patch"; - hash = "sha256-Y+2yVUkDHkwo49ynNHYXVXJpX4DfVYJ0CWKgzFX/HWc="; - }) # Remove "U" move from open(), https://github.com/wolever/pprintpp/pull/31 (fetchpatch { name = "remove-u.patch"; @@ -38,22 +33,9 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeCheckInputs = [ - nose - parameterized - pytestCheckHook - ]; - pythonImportsCheck = [ "pprintpp" ]; - pytestFlagsArray = [ "test.py" ]; - - disabledTests = [ - # AttributeError: 'EncodedFile' object has no attribute 'getvalue' - "test_pp" - "test_pp_pprint" - "test_fmt" - ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Drop-in replacement for pprint that's actually pretty";