From 36a0e92ed37b10b539f26f20d6c04aa124de6e20 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 18 Oct 2022 02:18:07 +0000
Subject: [PATCH 1/2] python310Packages.face: 20.1.1 -> 22.0.0

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

diff --git a/pkgs/development/python-modules/face/default.nix b/pkgs/development/python-modules/face/default.nix
index db1810ca056d..3f08fa7080d8 100644
--- a/pkgs/development/python-modules/face/default.nix
+++ b/pkgs/development/python-modules/face/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "face";
-  version = "20.1.1";
+  version = "22.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7d59ca5ba341316e58cf72c6aff85cca2541cf5056c4af45cb63af9a814bed3e";
+    sha256 = "sha256-1daS+QvI9Zh7Y25H42OEubvaSZqvCneqCwu+g0x2kj0=";
   };
 
   propagatedBuildInputs = [ boltons ];

From 0801990cff0f753777e3c487a9e4c279dc8fc9a5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 18 Oct 2022 23:30:58 +0200
Subject: [PATCH 2/2] python310Packages.face: switch to pytestCheckHook

- add pythonImportsCheck
- disable on older Python releases
- enable tests
---
 .../python-modules/face/default.nix           | 35 ++++++++++++++-----
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/face/default.nix b/pkgs/development/python-modules/face/default.nix
index 3f08fa7080d8..50db0ce94991 100644
--- a/pkgs/development/python-modules/face/default.nix
+++ b/pkgs/development/python-modules/face/default.nix
@@ -1,30 +1,47 @@
-{ lib, buildPythonPackage, fetchPypi, boltons, pytest }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, boltons
+, pytestCheckHook
+, pythonOlder
+}:
 
 buildPythonPackage rec {
   pname = "face";
   version = "22.0.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-1daS+QvI9Zh7Y25H42OEubvaSZqvCneqCwu+g0x2kj0=";
+    hash = "sha256-1daS+QvI9Zh7Y25H42OEubvaSZqvCneqCwu+g0x2kj0=";
   };
 
-  propagatedBuildInputs = [ boltons ];
+  propagatedBuildInputs = [
+    boltons
+  ];
 
-  checkInputs = [ pytest ];
-  checkPhase = "pytest face/test";
+  checkInputs = [
+    pytestCheckHook
+  ];
 
-  # ironically, test_parse doesn't parse, but fixed in git so no point
-  # reporting
-  doCheck = false;
+  pythonImportsCheck = [
+    "face"
+  ];
+
+  disabledTests = [
+    # Assertion error as we take the Python release into account
+    "test_search_prs_basic"
+  ];
 
   meta = with lib; {
-    homepage = "https://github.com/mahmoud/face";
     description = "A command-line interface parser and framework";
     longDescription = ''
       A command-line interface parser and framework, friendly for
       users, full-featured for developers.
     '';
+    homepage = "https://github.com/mahmoud/face";
     license = licenses.bsd3;
     maintainers = with maintainers; [ twey ];
   };