Merge pull request #214267 from dotlambda/robotframework-pythonlibcore-4.1.0

python310Packages.robotframework-pythonlibcore: 4.0.0 -> 4.1.0

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

@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, approvaltests
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "approval-utilities";
+  inherit (approvaltests) version src;
+  disabled = pythonOlder "3.7";
+  format = "setuptools";
+
+  postPatch = ''
+    mv setup.approval_utilities.py setup.py
+  '';
+
+  pythonImportsCheck = [ "approval_utilities" ];
+
+  # upstream has no tests
+  doCheck = false;
+
+  meta = {
+    description = "Utilities for your production code that work well with approvaltests";
+    homepage = "https://github.com/approvals/ApprovalTests.Python";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}

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

@@ -5,10 +5,13 @@
 
 # propagates
 , allpairspy
+, approval-utilities
 , beautifulsoup4
 , empty-files
+, mrjob
 , pyperclip
 , pytest
+, typing-extensions
 
 # tests
 , numpy
@@ -16,26 +19,29 @@
 }:
 
 buildPythonPackage rec {
-  version = "5.4.2";
+  version = "8.1.0";
   pname = "approvaltests";
   format = "setuptools";
 
-  disabled = pythonOlder "3.6.1";
+  disabled = pythonOlder "3.7";
 
   # no tests included in PyPI tarball
   src = fetchFromGitHub {
     owner = "approvals";
     repo = "ApprovalTests.Python";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-ZXtIM3McpfDFCaedlbJ6SU+Er5NyfI8kGnrn7sb1V5M=";
+    hash = "sha256-01OgofksXFglohcQtJqkir/nqBJArw3pXEmnX9P7rOA=";
   };
 
   propagatedBuildInputs = [
     allpairspy
+    approval-utilities
     beautifulsoup4
     empty-files
+    mrjob
     pyperclip
     pytest
+    typing-extensions
   ];
 
   nativeCheckInputs = [

pkgs/development/python-modules/robotframework-pythonlibcore/default.nix

@@ -2,7 +2,6 @@
 , buildPythonPackage
 , pythonOlder
 , fetchFromGitHub
-, fetchpatch
 , pytest-mockito
 , pytestCheckHook
 , robotframework
@@ -10,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "robotframework-pythonlibcore";
-  version = "4.0.0";
+  version = "4.1.0";
 
   disabled = pythonOlder "3.7";
 
@@ -20,17 +19,9 @@ buildPythonPackage rec {
     owner = "robotframework";
     repo = "PythonLibCore";
     rev = "v${version}";
-    hash = "sha256-86o5Lh9zWo4vUF2186dN7e8tTUu5PIxM/ZukPwNl0S8=";
+    hash = "sha256-BgnllONYJjfeKIN8BLfMw1iZrVewtXB1KN8b9KjdtK0=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "fix-finding-version.patch";
-      url = "https://github.com/robotframework/PythonLibCore/commit/84c73979e309f59de057ae6a77725ab0f468b71f.patch";
-      hash = "sha256-zrjsNvXpJDLpXql200NV+QGWFLtnRVZTeAjT52dRn2s=";
-    })
-  ];
-
   nativeCheckInputs = [
     pytest-mockito
     pytestCheckHook

pkgs/top-level/python-packages.nix

@@ -532,6 +532,8 @@ self: super: with self; {
 
   apprise = callPackage ../development/python-modules/apprise { };
 
+  approval-utilities = callPackage ../development/python-modules/approval-utilities { };
+
   approvaltests = callPackage ../development/python-modules/approvaltests { };
 
   apptools = callPackage ../development/python-modules/apptools { };