diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index b8e19d46f790..36ddd4d95b34 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -1,15 +1,27 @@ { lib +, stdenv , fetchFromGitHub , buildPythonPackage , pythonOlder + +# build-system +, hatchling + +# dependencies , click , redis + +# tests +, psutil +, pytestCheckHook +, redis-server +, sentry-sdk }: buildPythonPackage rec { pname = "rq"; - version = "1.15.1"; - format = "setuptools"; + version = "1.16.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,16 +29,33 @@ buildPythonPackage rec { owner = "rq"; repo = "rq"; rev = "refs/tags/v${version}"; - hash = "sha256-cymNXFI+6YEVw2Pc7u6+vroC0428oW7BTLxyBgPqLng="; + hash = "sha256-1E7jPTSQCjuKZVFL4uZqL1WZHnxWSLTNcnpyvfHz7oY="; }; - propagatedBuildInputs = [ + build-system = [ + hatchling + ]; + + dependencies = [ click redis ]; - # Tests require a running Redis rerver - doCheck = false; + nativeCheckInputs = [ + psutil + pytestCheckHook + sentry-sdk + ]; + + preCheck = lib.optionalString stdenv.isLinux '' + PATH=$out/bin:$PATH + ${redis-server}/bin/redis-server & + REDIS_PID=$! + ''; + + postCheck = lib.optionalString stdenv.isLinux '' + kill $REDIS_PID + ''; pythonImportsCheck = [ "rq" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c6796de6a9e9..c27a9ab74032 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13101,7 +13101,9 @@ self: super: with self; { rpyc4 = callPackage ../development/python-modules/rpyc4 { }; - rq = callPackage ../development/python-modules/rq { }; + rq = callPackage ../development/python-modules/rq { + redis-server = pkgs.redis; + }; rsa = callPackage ../development/python-modules/rsa { };