python3Packages.approvaltests: 15.0.0 -> 15.3.2 (#445571)

pkgs/development/python-modules/approval-utilities/default.nix

@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   approvaltests,
-  pythonOlder,
   setuptools,
   typing-extensions,
 }:
@@ -10,16 +9,15 @@
 buildPythonPackage {
   pname = "approval-utilities";
   inherit (approvaltests) version src;
-  disabled = pythonOlder "3.7";
   pyproject = true;
 
-  postPatch = ''
+  postPatch = approvaltests.postPatch or "" + ''
     mv setup.approval_utilities.py setup.py
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     # used in approval_utilities/utilities/time_utilities.py
     typing-extensions
   ];

pkgs/development/python-modules/approvaltests/default.nix

@@ -12,6 +12,7 @@
   pytest,
   pytest-asyncio,
   pytestCheckHook,
+  pyyaml,
   setuptools,
   testfixtures,
   typing-extensions,
@@ -19,16 +20,23 @@
 
 buildPythonPackage rec {
   pname = "approvaltests";
-  version = "15.0.0";
+  version = "15.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "approvals";
     repo = "ApprovalTests.Python";
     tag = "v${version}";
-    hash = "sha256-lXc81hQzxHxpg96OSWkkWmdmLOf4nU56dIKYVgLo+s8=";
+    hash = "sha256-cOaL8u5q9kx+yLB0e/ALnGYYGF5v50wsIIF1UUTPe1Y=";
   };
 
+  postPatch = ''
+    echo 'version_number = "${version}"' > version.py
+    mv .github approvaltests approval_utilities tests setup
+    cd setup
+    rm setup.cfg
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [
@@ -47,6 +55,7 @@ buildPythonPackage rec {
     numpy
     pytest-asyncio
     pytestCheckHook
+    pyyaml
   ];
 
   disabledTests = [

pkgs/development/python-modules/robotstatuschecker/default.nix

@@ -20,15 +20,9 @@ buildPythonPackage rec {
     hash = "sha256-YyiGd3XSIe+4PEL2l9LYDGH3lt1iRAAJflcBGYXaBzY=";
   };
 
-  postPatch = ''
-    # https://github.com/robotframework/statuschecker/issues/46
-    substituteInPlace test/tests.robot \
-      --replace-fail BuiltIn.Log Log
-  '';
+  build-system = [ setuptools ];
 
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [ robotframework ];
+  dependencies = [ robotframework ];
 
   checkPhase = ''
     runHook preCheck