about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFabian Affolter <fabian@affolter-engineering.ch>2023-11-13 12:21:24 +0100
committerGitHub <noreply@github.com>2023-11-13 12:21:24 +0100
commite6480813e1a7724fb1008513533dc9c88e8392a3 (patch)
tree12f12ffe1ea9fc767c97225173f153c4f0013916
parent115ddb0662ddffc011c6eb1bd86046fef2086300 (diff)
parentb9311beee860991393e99650eeadcf0a46ee5826 (diff)
Merge pull request #266983 from natsukium/py-stringmatching
python311Packages.py-stringmatching: rename from py_stringmatching
-rw-r--r--pkgs/development/python-modules/py-stringmatching/default.nix (renamed from pkgs/development/python-modules/py_stringmatching/default.nix)17
-rw-r--r--pkgs/top-level/python-aliases.nix1
-rw-r--r--pkgs/top-level/python-packages.nix2
3 files changed, 15 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/py_stringmatching/default.nix b/pkgs/development/python-modules/py-stringmatching/default.nix
index 8c49de1e5287c..9a1af7c13cf71 100644
--- a/pkgs/development/python-modules/py_stringmatching/default.nix
+++ b/pkgs/development/python-modules/py-stringmatching/default.nix
@@ -1,7 +1,8 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, nose
+, setuptools
+, pytestCheckHook
 , numpy
 , pythonOlder
 , six
@@ -10,25 +11,33 @@
 buildPythonPackage rec {
   pname = "py-stringmatching";
   version = "0.4.3";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     pname = "py_stringmatching";
     inherit version;
-    sha256 = "sha256-khubsWOzEN80HDOCORMgT3sMqfajGfW0UUCDAL03je4=";
+    hash = "sha256-khubsWOzEN80HDOCORMgT3sMqfajGfW0UUCDAL03je4=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     numpy
     six
   ];
 
   nativeCheckInputs = [
-    nose
+    pytestCheckHook
   ];
 
+  preCheck = ''
+    cd $out
+  '';
+
   pythonImportsCheck = [
     "py_stringmatching"
   ];
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 3b1a2e41046bd..24ffa5b35136e 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -281,6 +281,7 @@ mapAliases ({
   pushbullet = pushbullet-py;  # Added 2022-10-15
   Pweave = pweave; # added 2023-02-19
   py-radix = throw "py-radix has been removed, since it abandoned"; # added 2023-07-07
+  py_stringmatching = py-stringmatching; # added 2023-11-12
   pyalmond = throw "pyalmond has been removed, since its API endpoints have been shutdown"; # added 2023-02-02
   pyblake2 = throw "pyblake2 is deprecated in favor of hashlib"; # added 2023-04-23
   pyblock = throw "pyblock has been removed, since it is abandoned and broken"; # added 2023-06-20
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d8b708e42cec7..d1d1b060133f0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11045,7 +11045,7 @@ self: super: with self; {
 
   pystray = callPackage ../development/python-modules/pystray { };
 
-  py_stringmatching = callPackage ../development/python-modules/py_stringmatching { };
+  py-stringmatching = callPackage ../development/python-modules/py-stringmatching { };
 
   pysvg-py3 = callPackage ../development/python-modules/pysvg-py3 { };