From abb3be525d6d57f58854fa27f870852030fd88bd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 10 Oct 2024 18:42:24 +0200 Subject: [PATCH] python312Packages.django-redis: modernize --- .../python-modules/django-redis/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/django-redis/default.nix b/pkgs/development/python-modules/django-redis/default.nix index 94249cebd94c..6d84ad60fe38 100644 --- a/pkgs/development/python-modules/django-redis/default.nix +++ b/pkgs/development/python-modules/django-redis/default.nix @@ -14,6 +14,7 @@ # testing pkgs, + pytest-cov-stub, pytest-django, pytest-mock, pytestCheckHook, @@ -33,11 +34,7 @@ buildPythonPackage rec { hash = "sha256-m7z3c7My24vrSSnyfDQ/LlWhy7pV4U0L8LATMvkfczc="; }; - postPatch = '' - sed -i '/-cov/d' setup.cfg - ''; - - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; propagatedBuildInputs = [ django @@ -52,9 +49,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "django_redis" ]; - DJANGO_SETTINGS_MODULE = "tests.settings.sqlite"; - preCheck = '' + export DJANGO_SETTINGS_MODULE=tests.settings.sqlite + ${pkgs.redis}/bin/redis-server & REDIS_PID=$! ''; @@ -64,10 +61,11 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ + pytest-cov-stub pytest-django pytest-mock pytestCheckHook - ] ++ lib.flatten (builtins.attrValues optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pytestFlagsArray = [ "-W"