From fa2180a409e5d89670353d27436d444d0b709d24 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jan 2023 17:12:07 +0000
Subject: [PATCH 1/2] python310Packages.pytest-relaxed: 1.1.5 -> 2.0.0

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

diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/pkgs/development/python-modules/pytest-relaxed/default.nix
index 13838eb326c9..572bd223de20 100644
--- a/pkgs/development/python-modules/pytest-relaxed/default.nix
+++ b/pkgs/development/python-modules/pytest-relaxed/default.nix
@@ -8,12 +8,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.1.5";
+  version = "2.0.0";
   pname = "pytest-relaxed";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e39a7e5b14e14dfff0de0ad720dfffa740c128d599ab14cfac13f4deb34164a6";
+    sha256 = "sha256-Szc8x1Rmb/YPVCWmnLQUZCwqEc56RsjOBmpzjkCSyjk=";
   };
 
   # newer decorator versions are incompatible and cause the test suite to fail

From c66d24a7ff4bc873d706aca9f976dbb8ed34df40 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Jan 2023 10:44:48 +0100
Subject: [PATCH 2/2] python310Packages.pytest-relaxed: add changelog to meta

- disable on unsupported Python releases
- re-enable tests
- no longer broken
---
 .../python-modules/pytest-relaxed/default.nix | 49 +++++++++++--------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/pkgs/development/python-modules/pytest-relaxed/default.nix
index 572bd223de20..46a95c725d47 100644
--- a/pkgs/development/python-modules/pytest-relaxed/default.nix
+++ b/pkgs/development/python-modules/pytest-relaxed/default.nix
@@ -1,44 +1,53 @@
 { lib
 , buildPythonPackage
-, fetchPypi
-, pytest
-, six
 , decorator
+, fetchPypi
+, invocations
+, invoke
+, pytest
 , pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
-  version = "2.0.0";
   pname = "pytest-relaxed";
+  version = "2.0.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Szc8x1Rmb/YPVCWmnLQUZCwqEc56RsjOBmpzjkCSyjk=";
+    hash = "sha256-Szc8x1Rmb/YPVCWmnLQUZCwqEc56RsjOBmpzjkCSyjk=";
   };
 
-  # newer decorator versions are incompatible and cause the test suite to fail
-  # but only a few utility functions are used from this package which means it has no actual impact on test execution in paramiko and Fabric
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "decorator>=4,<5" "decorator>=4" \
-      --replace "pytest>=3,<5" "pytest>=3"
-  '';
+  buildInputs = [
+    pytest
+  ];
 
-  buildInputs = [ pytest ];
+  propagatedBuildInputs = [
+    decorator
+  ];
 
-  propagatedBuildInputs = [ six decorator ];
+  checkInputs = [
+    invocations
+    invoke
+    pytestCheckHook
+  ];
 
-  checkInputs = [ pytestCheckHook ];
+  pytestFlagsArray = [
+    "tests"
+  ];
 
-  # lots of assertion errors mainly around decorator
-  doCheck = false;
+  pythonImportsCheck = [
+    "pytest_relaxed"
+  ];
 
   meta = with lib; {
     homepage = "https://pytest-relaxed.readthedocs.io/";
     description = "Relaxed test discovery/organization for pytest";
+    changelog = "https://github.com/bitprophet/pytest-relaxed/blob/${version}/docs/changelog.rst";
     license = licenses.bsd0;
-    maintainers = [ maintainers.costrouc ];
-    # see https://github.com/bitprophet/pytest-relaxed/issues/12
-    broken = true;
+    maintainers = with maintainers; [ costrouc ];
   };
 }