From f2898ed00ad78f92feefe5a214314f3d2894e2c8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 1 Feb 2023 23:19:44 +0100
Subject: [PATCH] python3Packages.pymodbus: 3.0.2 -> 3.1.2

https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.1.0
https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.1.1
https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.1.2
---
 .../python-modules/pymodbus/default.nix        | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix
index 1aba805c59dc..a6e3f5eb9a74 100644
--- a/pkgs/development/python-modules/pymodbus/default.nix
+++ b/pkgs/development/python-modules/pymodbus/default.nix
@@ -10,6 +10,8 @@
 , pyserial
 , pyserial-asyncio
 , pytest-asyncio
+, pytest-rerunfailures
+, pytest-xdist
 , pytestCheckHook
 , redis
 , sqlalchemy
@@ -19,13 +21,14 @@
 
 buildPythonPackage rec {
   pname = "pymodbus";
-  version = "3.0.2";
+  version = "3.1.2";
+  format = "setuptools";
 
   src = fetchFromGitHub {
-    owner = "riptideio";
+    owner = "pymodbus-dev";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-7zuFKJuKc+J4g7qoK22xed8dmXJatQbQXz4aKAOcvN8=";
+    hash = "sha256-kae/TADu23NnCrXkJ/dkDBNIgBm/+BxXf+lh8uMxz/s=";
   };
 
   # Twisted asynchronous version is not supported due to a missing dependency
@@ -43,12 +46,18 @@ buildPythonPackage rec {
     asynctest
     mock
     pytest-asyncio
+    pytest-rerunfailures
+    pytest-xdist
     pytestCheckHook
     redis
     sqlalchemy
     twisted
   ];
 
+  pytestFlagsArray = [
+    "--reruns" "3" # Racy socket tests
+  ];
+
   pythonImportsCheck = [ "pymodbus" ];
 
   meta = with lib; {
@@ -59,7 +68,8 @@ buildPythonPackage rec {
       also be used without any third party dependencies if a more
       lightweight project is needed.
     '';
-    homepage = "https://github.com/riptideio/pymodbus";
+    homepage = "https://github.com/pymodbus-dev/pymodbus";
+    changelog = "https://github.com/pymodbus-dev/pymodbus/releases/tag/v${version}";
     license = with licenses; [ bsd3 ];
     maintainers = with maintainers; [ fab ];
   };