From 5815fcf9c2a3ed81d15ae6e530c2939ddcba06e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 2 Nov 2023 14:33:57 -0700 Subject: [PATCH] python311Packages.jarowinkler: 1.2.3 -> 2.0.1 Diff: https://github.com/maxbachmann/JaroWinkler/compare/refs/tags/v1.2.3...v2.0.1 Changelog: https://github.com/maxbachmann/JaroWinkler/blob/refs/tags/v2.0.1/CHANGELOG.md --- .../python-modules/jarowinkler/default.nix | 41 ++++--------------- pkgs/top-level/python-packages.nix | 4 +- 2 files changed, 9 insertions(+), 36 deletions(-) diff --git a/pkgs/development/python-modules/jarowinkler/default.nix b/pkgs/development/python-modules/jarowinkler/default.nix index 7265505fe13b..a0196265b845 100644 --- a/pkgs/development/python-modules/jarowinkler/default.nix +++ b/pkgs/development/python-modules/jarowinkler/default.nix @@ -2,60 +2,35 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, cmake -, ninja -, cython -, rapidfuzz-capi -, scikit-build , setuptools -, wheel -, jarowinkler-cpp +, rapidfuzz , hypothesis , pytestCheckHook }: buildPythonPackage rec { pname = "jarowinkler"; - version = "1.2.3"; - format = "pyproject"; + version = "2.0.1"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; + + pyproject = true; src = fetchFromGitHub { owner = "maxbachmann"; repo = "JaroWinkler"; rev = "refs/tags/v${version}"; - hash = "sha256-j+ZabVsiVitNkTPhGjDg72XogjvPaL453lTW45ITm90="; + hash = "sha256-B3upTBNqMyi+CH7Zx04wceEXjGJnr6S3BIl87AQkfbo="; }; - # We cannot use Cython version 3.0.0 because the code in jarowinkler has not - # been adapted for https://github.com/cython/cython/issues/4280 yet - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'scikit-build==' 'scikit-build>=' \ - --replace 'Cython==3.0.0a11' 'Cython' - ''; - nativeBuildInputs = [ - cmake - cython - ninja - rapidfuzz-capi - scikit-build setuptools - wheel ]; - buildInputs = [ - jarowinkler-cpp + propagatedBuildInputs = [ + rapidfuzz ]; - preBuild = '' - export JAROWINKLER_BUILD_EXTENSION=1 - ''; - - dontUseCmakeConfigure = true; - nativeCheckInputs = [ hypothesis pytestCheckHook diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2293e7c1643b..882922ce2db3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5568,9 +5568,7 @@ self: super: with self; { jaraco-text = callPackage ../development/python-modules/jaraco-text { }; - jarowinkler = callPackage ../development/python-modules/jarowinkler { - inherit (pkgs) cmake ninja; - }; + jarowinkler = callPackage ../development/python-modules/jarowinkler { }; javaobj-py3 = callPackage ../development/python-modules/javaobj-py3 { };