Merge pull request #311072 from mweinelt/gssapi-fixes

python3Packages.shouldbe: drop; python312Packages.gssapi: fix build

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

@@ -3,22 +3,29 @@
 , buildPythonPackage
 , pythonOlder
 , fetchFromGitHub
-, six
-, decorator
-, nose
-, krb5
-, GSS
-, parameterized
-, shouldbe
+
+# build-system
 , cython
-, python
+, krb5
+, setuptools
+
+# dependencies
+, decorator
+
+# native dependencies
+, GSS
+
+# tests
+, parameterized
 , k5test
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "gssapi";
   version = "1.8.3";
-  format = "setuptools";
+  pyproject = true;
+
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
@@ -28,7 +35,6 @@ buildPythonPackage rec {
     hash = "sha256-H1JfdvxJvX5dmC9aTqIOkjAqFEL44KoUXEhoYj2uRY8=";
   };
 
-  # It's used to locate headers
   postPatch = ''
     substituteInPlace setup.py \
       --replace 'get_output(f"{kc} gssapi --prefix")' '"${lib.getDev krb5}"'
@@ -38,14 +44,14 @@ buildPythonPackage rec {
     GSSAPI_SUPPORT_DETECT = "false";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     cython
     krb5
+    setuptools
   ];
 
-  propagatedBuildInputs =  [
+  dependencies =  [
     decorator
-    six
   ];
 
   buildInputs = lib.optionals stdenv.isDarwin [
@@ -54,26 +60,19 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     k5test
-    nose
     parameterized
-    shouldbe
-    six
+    pytestCheckHook
   ];
 
-  doCheck = pythonOlder "3.8"  # `shouldbe` not available
-    && !stdenv.isDarwin;  # many failures on darwin
-
-  # skip tests which fail possibly due to be an upstream issue (see
-  # https://github.com/pythongssapi/python-gssapi/issues/220)
-  checkPhase = ''
-    # some tests don't respond to being disabled through nosetests -x
-    echo $'\ndel CredsTestCase.test_add_with_impersonate' >> gssapi/tests/test_high_level.py
-    echo $'\ndel TestBaseUtilities.test_acquire_creds_impersonate_name' >> gssapi/tests/test_raw.py
-    echo $'\ndel TestBaseUtilities.test_add_cred_impersonate_name' >> gssapi/tests/test_raw.py
-
-    export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH"
-    nosetests -e 'ext_test_\d.*'
+  preCheck = ''
+    mv gssapi/tests $TMPDIR/
+    pushd $TMPDIR
   '';
+
+  postCheck = ''
+    popd
+  '';
+
   pythonImportsCheck = [ "gssapi" ];
 
   meta = with lib; {

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

@@ -1,30 +0,0 @@
-{ lib
-, buildPythonPackage
-, pythonAtLeast
-, fetchPypi
-, nose
-, forbiddenfruit
-}:
-
-buildPythonPackage rec {
-  version = "0.1.2";
-  format = "setuptools";
-  pname = "shouldbe";
-  # incompatible, https://github.com/DirectXMan12/should_be/issues/4
-  disabled = pythonAtLeast "3.8";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "16zbvjxf71dl4yfbgcr6idyim3mdrfvix1dv8b95p0s9z07372pj";
-  };
-
-  nativeCheckInputs = [ nose ];
-  propagatedBuildInputs = [ forbiddenfruit ];
-
-  meta = with lib; {
-    description = "Python Assertion Helpers inspired by Shouldly";
-    homepage =  "https://pypi.python.org/pypi/shouldbe/";
-    license = licenses.mit;
-  };
-
-}

pkgs/top-level/python-aliases.nix

@@ -472,6 +472,7 @@ mapAliases ({
   setuptools_scm = setuptools-scm; # added 2021-06-03
   setuptoolsTrial = setuptools-trial; # added 2023-11-11
   sharkiqpy = sharkiq; # added 2022-05-21
+  shouldbe = throw "shouldbe was removed, because it was disabled on all python version since 3.8 and last updated in 2019."; # added 2024-05-12
   sip_4 = sip4; # added 2024-01-07
   ssh-mitm = throw "ssh-mitm was removed in favor of the top-level ssh-mitm"; # added 2023-05-09
   smart_open = smart-open; # added 2021-03-14

pkgs/top-level/python-packages.nix

@@ -13864,8 +13864,6 @@ self: super: with self; {
 
   shortuuid = callPackage ../development/python-modules/shortuuid { };
 
-  shouldbe = callPackage ../development/python-modules/shouldbe { };
-
   should-dsl = callPackage ../development/python-modules/should-dsl { };
 
   show-in-file-manager = callPackage ../development/python-modules/show-in-file-manager { };