From fbc527262b766181e20e91d2e8bb7377236ac70d Mon Sep 17 00:00:00 2001 From: Pyrox Date: Fri, 2 Aug 2024 15:26:02 -0400 Subject: [PATCH 1/2] python312Packages.mohawk: drop nose dependency --- .../python-modules/mohawk/default.nix | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/mohawk/default.nix b/pkgs/development/python-modules/mohawk/default.nix index 4fab29c45967..67440d86ab41 100644 --- a/pkgs/development/python-modules/mohawk/default.nix +++ b/pkgs/development/python-modules/mohawk/default.nix @@ -2,9 +2,8 @@ lib, buildPythonPackage, fetchPypi, - mock, - nose, - pytest, + fetchpatch2, + pytestCheckHook, six, }: @@ -18,17 +17,20 @@ buildPythonPackage rec { sha256 = "08wppsv65yd0gdxy5zwq37yp6jmxakfz4a2yx5wwq2d222my786j"; }; - propagatedBuildInputs = [ six ]; - - nativeCheckInputs = [ - mock - nose - pytest + patches = [ + (fetchpatch2 { + # https://github.com/kumar303/mohawk/pull/59 + name = "nose-to-pytest.patch"; + url = "https://github.com/kumar303/mohawk/compare/b7899166880e890f01cf2531b5686094ba08df8f...66157c7efbf6b0d18c30a9ffe5dfd84bef27bd3a.patch"; + hash = "sha256-w3sP5XeBqOwoPGsWzYET4djYwuKPaS4OOlC3HBPD0NI="; + }) ]; - checkPhase = '' - pytest mohawk/tests.py - ''; + propagatedBuildInputs = [ six ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "mohawk/tests.py" ]; meta = { description = "Python library for Hawk HTTP authorization"; From e3607cabb8720ee0d1f6ab914e8a717c50be5cad Mon Sep 17 00:00:00 2001 From: Pyrox Date: Fri, 2 Aug 2024 15:27:17 -0400 Subject: [PATCH 2/2] python312Packages.mohawk: modernize --- pkgs/development/python-modules/mohawk/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mohawk/default.nix b/pkgs/development/python-modules/mohawk/default.nix index 67440d86ab41..5054fcae7b79 100644 --- a/pkgs/development/python-modules/mohawk/default.nix +++ b/pkgs/development/python-modules/mohawk/default.nix @@ -5,16 +5,17 @@ fetchpatch2, pytestCheckHook, six, + setuptools, }: buildPythonPackage rec { pname = "mohawk"; version = "1.1.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "08wppsv65yd0gdxy5zwq37yp6jmxakfz4a2yx5wwq2d222my786j"; + hash = "sha256-0qDjqxCiCcx56V4o8t1UvUpz/RmY/+J7e6D5Yra+lyM="; }; patches = [ @@ -26,7 +27,9 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; + + dependencies = [ six ]; nativeCheckInputs = [ pytestCheckHook ];