Merge pull request #208651 from r-ryantm/auto-update/python3.10-pytest-relaxed

python310Packages.pytest-relaxed: 1.1.5 -> 2.0.0

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 = "1.1.5";
   pname = "pytest-relaxed";
+  version = "2.0.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e39a7e5b14e14dfff0de0ad720dfffa740c128d599ab14cfac13f4deb34164a6";
+    hash = "sha256-Szc8x1Rmb/YPVCWmnLQUZCwqEc56RsjOBmpzjkCSyjk=";
   };
 
-  # newer decorator versions are incompatible and cause the test suite to fail
+  buildInputs = [
-  # 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
+    pytest
-  postPatch = ''
+  ];
-    substituteInPlace setup.py \
-      --replace "decorator>=4,<5" "decorator>=4" \
-      --replace "pytest>=3,<5" "pytest>=3"
-  '';
 
-  buildInputs = [ pytest ];
+  propagatedBuildInputs = [
+    decorator
+  ];
 
-  propagatedBuildInputs = [ six decorator ];
+  checkInputs = [
+    invocations
+    invoke
+    pytestCheckHook
+  ];
 
-  checkInputs = [ pytestCheckHook ];
+  pytestFlagsArray = [
+    "tests"
+  ];
 
-  # lots of assertion errors mainly around decorator
+  pythonImportsCheck = [
-  doCheck = false;
+    "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 ];
+    maintainers = with maintainers; [ costrouc ];
-    # see https://github.com/bitprophet/pytest-relaxed/issues/12
-    broken = true;
   };
 }