python3Packages.rq: 2.4.1 -> 2.6.1; python3Packages.django-rq: 3.1 -> 3.2.1 (#468833)

pkgs/development/python-modules/django-rq/default.nix

@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
   hatchling,
@@ -8,22 +9,22 @@
   rq,
   prometheus-client,
   sentry-sdk,
-  psycopg,
   pytest-django,
   pytestCheckHook,
+  pyyaml,
   redisTestHook,
 }:
 
 buildPythonPackage rec {
   pname = "django-rq";
-  version = "3.1";
+  version = "3.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rq";
     repo = "django-rq";
     tag = "v${version}";
-    hash = "sha256-TnOKgw52ykKcR0gHXcdYfv77js7I63PE1F3POdwJgvc=";
+    hash = "sha256-oHBQpGRiNJFt07KEPC+KcCF6qM5PgSTyr0t35iyYhK4=";
   };
 
   build-system = [ hatchling ];
@@ -41,7 +42,20 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "django_rq" ];
 
-  doCheck = false; # require redis-server
+  # redis hook does not support darwin
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
+  nativeCheckInputs = [
+    pytest-django
+    pytestCheckHook
+    pyyaml
+    redisTestHook
+  ]
+  ++ lib.concatAttrValues optional-dependencies;
+
+  preCheck = ''
+    export DJANGO_SETTINGS_MODULE=tests.settings
+  '';
 
   meta = with lib; {
     description = "Simple app that provides django integration for RQ (Redis Queue)";

pkgs/development/python-modules/django-tasks/default.nix

@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
@@ -13,6 +14,7 @@
   fakeredis,
   pytestCheckHook,
   pytest-django,
+  redisTestHook,
 }:
 
 buildPythonPackage rec {
@@ -48,12 +50,16 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "django_tasks" ];
 
+  # redis hook does not support darwin
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
   nativeCheckInputs = [
-    dj-database-url
     django-rq
+    dj-database-url
     fakeredis
     pytestCheckHook
     pytest-django
+    redisTestHook
   ];
 
   disabledTests = [

pkgs/development/python-modules/rq/default.nix

@@ -9,6 +9,7 @@
 
   # dependencies
   click,
+  croniter,
   redis,
 
   # tests
@@ -21,20 +22,21 @@
 
 buildPythonPackage rec {
   pname = "rq";
-  version = "2.4.1";
+  version = "2.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rq";
     repo = "rq";
     tag = "v${version}";
-    hash = "sha256-CtxirZg6WNQpTMoXQRvB8i/KB3r58WlKh+wjBvyVMMs=";
+    hash = "sha256-4+zP3pOiZ+r/dt9F2NyxgJsyGPIHgj9XokuPxlWyS1g=";
   };
 
   build-system = [ hatchling ];
 
   dependencies = [
     click
+    croniter
     redis
   ];