From e9ffb19d7949b14f49020cb08e7010ed58c01499 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Jul 2023 08:30:51 +0000
Subject: [PATCH 1/4] python310Packages.allpairspy: 2.5.0 -> 2.5.1

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

diff --git a/pkgs/development/python-modules/allpairspy/default.nix b/pkgs/development/python-modules/allpairspy/default.nix
index b029296fd3a7..93188736c833 100644
--- a/pkgs/development/python-modules/allpairspy/default.nix
+++ b/pkgs/development/python-modules/allpairspy/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "allpairspy";
-  version = "2.5.0";
+  version = "2.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9358484c91abe74ba18daf9d6d6904c5be7cc8818397d05248c9d336023c28b1";
+    sha256 = "sha256-9p0xo7Vu7hGdHsYGPpxzLdRPu6NS73OMsi2WmfxACf4=";
   };
 
   propagatedBuildInputs = [ six ];

From 03848975178ba9fe61ad2e5b62a63f0cb581479f Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 11 Jul 2023 04:20:00 +0000
Subject: [PATCH 2/4] python310Packages.allpairspy: use pyproject format

---
 .../python-modules/allpairspy/default.nix     | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/allpairspy/default.nix b/pkgs/development/python-modules/allpairspy/default.nix
index 93188736c833..da22d65c3639 100644
--- a/pkgs/development/python-modules/allpairspy/default.nix
+++ b/pkgs/development/python-modules/allpairspy/default.nix
@@ -1,21 +1,28 @@
-{ lib, buildPythonPackage, fetchPypi, six, pytest }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, setuptools
+}:
 
 buildPythonPackage rec {
   pname = "allpairspy";
   version = "2.5.1";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "sha256-9p0xo7Vu7hGdHsYGPpxzLdRPu6NS73OMsi2WmfxACf4=";
   };
 
-  propagatedBuildInputs = [ six ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    setuptools
+  ];
 
-  nativeCheckInputs = [ pytest ];
-
-  checkPhase = ''
-    py.test
-  '';
+  pythonImportsCheck = [
+    "allpairspy"
+  ];
 
   meta = with lib; {
     description = "Pairwise test combinations generator";

From 834ed32062fddd7bb1d85e883458a9d54093ee26 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 11 Jul 2023 04:20:00 +0000
Subject: [PATCH 3/4] python310Packages.allpairspy: add changelog to meta

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

diff --git a/pkgs/development/python-modules/allpairspy/default.nix b/pkgs/development/python-modules/allpairspy/default.nix
index da22d65c3639..a59a0a9f702c 100644
--- a/pkgs/development/python-modules/allpairspy/default.nix
+++ b/pkgs/development/python-modules/allpairspy/default.nix
@@ -27,6 +27,8 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Pairwise test combinations generator";
     homepage = "https://github.com/thombashi/allpairspy";
+    changelog = "https://github.com/thombashi/allpairspy/releases/tag/v${version}";
     license = licenses.mit;
+    maintainers = [ ];
   };
 }

From 8742e41f50277a7353c0ab5b93bf01d42a97f39f Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 11 Jul 2023 04:20:00 +0000
Subject: [PATCH 4/4] python310Packages.robomachine: fix build

---
 .../python-modules/robomachine/default.nix    | 41 ++++++++++++++-----
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix
index 768aaeb89cf6..613b47a8e601 100644
--- a/pkgs/development/python-modules/robomachine/default.nix
+++ b/pkgs/development/python-modules/robomachine/default.nix
@@ -1,27 +1,48 @@
-{ stdenv, lib, fetchPypi, buildPythonPackage, pyparsing, robotframework, allpairspy }:
+{ stdenv
+, lib
+, allpairspy
+, buildPythonPackage
+, fetchPypi
+, pyparsing
+, pythonRelaxDepsHook
+, robotframework
+, setuptools
+}:
 
 buildPythonPackage rec {
   pname = "RoboMachine";
   version = "0.10.0";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-XrxHaV9U7mZ2TvySHGm6qw1AsoukppzwPq4wufIjL+k=";
   };
 
-  propagatedBuildInputs = [ pyparsing robotframework allpairspy ];
+  nativeBuildInputs = [
+    pythonRelaxDepsHook
+    setuptools
+  ];
 
-  # Remove Windows .bat files
-  postInstall = ''
-    rm "$out/bin/"*.bat
-  '';
+  propagatedBuildInputs = [
+    pyparsing
+    robotframework
+    allpairspy
+  ];
 
-  postPatch = ''
-    substituteInPlace setup.py --replace "argparse" ""
-  '';
+  pythonRemoveDeps = [
+    "argparse"
+  ];
+
+  pythonRelaxDeps = [
+    "pyparsing"
+  ];
+
+  pythonImportsCheck = [
+    "robomachine"
+  ];
 
   meta = with lib; {
-    broken = true;
     description = "Test data generator for Robot Framework";
     homepage = "https://github.com/mkorpela/RoboMachine";
     license = licenses.asl20;