From 3cbc97be2c5b4a9c15af527fd1dc6938af63fb13 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Aug 2025 20:36:56 +0200 Subject: [PATCH 1/4] python313Packages.normality: 2.6.1 -> 3.0.1 Diff: https://github.com/pudo/normality/compare/2.6.1...3.0.1 --- .../python-modules/normality/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/normality/default.nix b/pkgs/development/python-modules/normality/default.nix index 3e46d2cdf2bf..242a8295c622 100644 --- a/pkgs/development/python-modules/normality/default.nix +++ b/pkgs/development/python-modules/normality/default.nix @@ -3,36 +3,36 @@ fetchFromGitHub, buildPythonPackage, hatchling, - text-unidecode, charset-normalizer, chardet, banal, pyicu, pytestCheckHook, }: + buildPythonPackage rec { pname = "normality"; - version = "2.6.1"; + version = "3.0.1"; pyproject = true; src = fetchFromGitHub { owner = "pudo"; repo = "normality"; - rev = version; - hash = "sha256-RsZP/GkEuPKGZK2+/57kvMwm9vk0FTKN2/XtOmfoZxA="; + tag = version; + hash = "sha256-AAxFsdh2pv317hn9vr8Xpz9QPLYEa3KMDcObwR51NWo="; }; - buildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ charset-normalizer - text-unidecode chardet banal pyicu ]; nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "normality" ]; meta = { From 743084df4502b3f5a98b1481e7a8ad1871e90480 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Aug 2025 20:37:06 +0200 Subject: [PATCH 2/4] python313Packages.fingerprints: 1.2.3 -> 1.3.1 --- .../python-modules/fingerprints/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/fingerprints/default.nix b/pkgs/development/python-modules/fingerprints/default.nix index 6b3bf80810f6..da70838c607d 100644 --- a/pkgs/development/python-modules/fingerprints/default.nix +++ b/pkgs/development/python-modules/fingerprints/default.nix @@ -2,29 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, + hatchling, normality, pytestCheckHook, - pythonOlder, - setuptools, }: buildPythonPackage rec { pname = "fingerprints"; - version = "1.2.3"; + version = "1.3.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "alephdata"; repo = "fingerprints"; - rev = version; - hash = "sha256-U2UslCy1OagVTtllCKsEBX4zI/qIczbxs2Cxzy+/Xys="; + tag = version; + hash = "sha256-Q+XCsuGMHPtOqB0SauVuYInR5FGMuG6aNhqiAwTJvSI="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ normality ]; + dependencies = [ normality ]; nativeCheckInputs = [ pytestCheckHook ]; From 42e35b79728c2514ca8d1f1608af59876d72802c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Aug 2025 20:52:01 +0200 Subject: [PATCH 3/4] python313Packages.python-stdnum: 1.20 -> 2.1 Changelog: https://github.com/arthurdejong/python-stdnum/blob/2.1/ChangeLog --- .../python-modules/python-stdnum/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index c7acea928a81..cf0c31466010 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -4,24 +4,22 @@ fetchPypi, pytestCheckHook, pytest-cov-stub, - pythonOlder, setuptools, zeep, }: buildPythonPackage rec { pname = "python-stdnum"; - version = "1.20"; + version = "2.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-rSos8usCXeQIIQI182tK4xJS3jGGJAzKqBJuEXy4JpA="; + pname = "python_stdnum"; + inherit version; + hash = "sha256-awFkWWnrPf1VBhoBFNWTdTzZ5lPOqQgxmLfuoSZEOXo="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook From b4e057c1255448fdfd105f8ae433a316c4c2ad9f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Aug 2025 20:55:57 +0200 Subject: [PATCH 4/4] python313Packages.rigour: 0.8.2 -> 1.2.2 --- .../python-modules/rigour/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/rigour/default.nix b/pkgs/development/python-modules/rigour/default.nix index 0d11ffb20d47..9d88f21c99db 100644 --- a/pkgs/development/python-modules/rigour/default.nix +++ b/pkgs/development/python-modules/rigour/default.nix @@ -1,32 +1,34 @@ { lib, - buildPythonPackage, - fetchFromGitHub, - hatchling, + ahocorasick-rs, babel, banal, + buildPythonPackage, + fetchFromGitHub, fingerprints, + hatchling, jellyfish, jinja2, normality, + orjson, + pytestCheckHook, python-stdnum, pytz, pyyaml, rapidfuzz, typing-extensions, - pytestCheckHook, }: buildPythonPackage rec { pname = "rigour"; - version = "0.8.2"; + version = "1.2.2"; pyproject = true; src = fetchFromGitHub { owner = "opensanctions"; repo = "rigour"; tag = "v${version}"; - hash = "sha256-endggriOj+DBWfcYDQ034OvzxVCaHV9QUMAk0qtSYPg="; + hash = "sha256-k0rOl9mkSD7Evb8wc043Coa2UNSlaX7BqUscqcEciRQ="; }; build-system = [ @@ -34,12 +36,14 @@ buildPythonPackage rec { ]; dependencies = [ + ahocorasick-rs babel banal fingerprints jellyfish jinja2 normality + orjson python-stdnum pytz pyyaml