From 0a1ede550a1cd5cf52d87b88b3a83d1acb6abad8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Mar 2024 13:20:16 +0000
Subject: [PATCH 1/3] python311Packages.batchspawner: 1.2.0 -> 1.3.0

---
 pkgs/development/python-modules/batchspawner/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/batchspawner/default.nix b/pkgs/development/python-modules/batchspawner/default.nix
index ed1bf400f631..106435af040b 100644
--- a/pkgs/development/python-modules/batchspawner/default.nix
+++ b/pkgs/development/python-modules/batchspawner/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "batchspawner";
-  version = "1.2.0";
+  version = "1.3.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.5";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "jupyterhub";
     repo = "batchspawner";
     rev = "refs/tags/v${version}";
-    hash = "sha256-oyS47q+gsO7JmRsbVJXglZsSRfits5rS/nrHW5E7EV0=";
+    hash = "sha256-Z7kB8b7s11wokTachLI/N+bdUV+FfCRTemL1KYQpzio=";
   };
 
   propagatedBuildInputs = [

From 00155e6f423cf485c353b913dc4d78a4d0ce8897 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Thu, 21 Mar 2024 21:50:45 +0900
Subject: [PATCH 2/3] python311Packages.batchspawner: refactor

---
 .../python-modules/batchspawner/default.nix     | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/batchspawner/default.nix b/pkgs/development/python-modules/batchspawner/default.nix
index 106435af040b..9e54f054e005 100644
--- a/pkgs/development/python-modules/batchspawner/default.nix
+++ b/pkgs/development/python-modules/batchspawner/default.nix
@@ -1,17 +1,19 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, setuptools
+, wheel
+, jinja2
 , jupyterhub
-, packaging
 , pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "batchspawner";
   version = "1.3.0";
-  format = "setuptools";
+  pyproject = true;
 
-  disabled = pythonOlder "3.5";
+  disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "jupyterhub";
@@ -20,9 +22,14 @@ buildPythonPackage rec {
     hash = "sha256-Z7kB8b7s11wokTachLI/N+bdUV+FfCRTemL1KYQpzio=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    setuptools
+    wheel
+  ];
+
+  dependencies = [
+    jinja2
     jupyterhub
-    packaging
   ];
 
   # Tests require a job scheduler e.g. slurm, pbs, etc.

From f888753776bccfcc8616e400aac823c651fb83ed Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Thu, 21 Mar 2024 21:52:50 +0900
Subject: [PATCH 3/3] python311Packages.batchspawner: enable tests

---
 .../python-modules/batchspawner/default.nix         | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/batchspawner/default.nix b/pkgs/development/python-modules/batchspawner/default.nix
index 9e54f054e005..87c6aa2cafbf 100644
--- a/pkgs/development/python-modules/batchspawner/default.nix
+++ b/pkgs/development/python-modules/batchspawner/default.nix
@@ -6,6 +6,8 @@
 , jinja2
 , jupyterhub
 , pythonOlder
+, pytest-asyncio
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
@@ -32,8 +34,15 @@ buildPythonPackage rec {
     jupyterhub
   ];
 
-  # Tests require a job scheduler e.g. slurm, pbs, etc.
-  doCheck = false;
+  preCheck = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "--cov=batchspawner" ""
+  '';
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [
     "batchspawner"