From 76f4d9eabd0758101de7bcbacead1317fd0b946c Mon Sep 17 00:00:00 2001 From: Harinn Date: Sat, 6 Jun 2026 09:16:06 +0700 Subject: [PATCH 1/3] python3Packages.bottleneck: migrate to pyproject --- .../development/python-modules/bottleneck/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix index 81b3f8b10a8c..3cbb5cf32d27 100644 --- a/pkgs/development/python-modules/bottleneck/default.nix +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchPypi, + setuptools, + versioneer, numpy, pytestCheckHook, python, @@ -10,14 +12,19 @@ buildPythonPackage rec { pname = "bottleneck"; version = "1.6.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-Ao1G7ksCWtmrTXmSQROBb4JfYrF7h8nh0NjOFEpKDjE="; }; - propagatedBuildInputs = [ numpy ]; + build-system = [ + setuptools + versioneer + ]; + + dependencies = [ numpy ]; nativeCheckInputs = [ pytestCheckHook ]; From dd6067b1f2d8089f6967b8d05b995ec378480368 Mon Sep 17 00:00:00 2001 From: Harinn Date: Sat, 6 Jun 2026 09:21:17 +0700 Subject: [PATCH 2/3] python3Packages.bottleneck: modernize --- pkgs/development/python-modules/bottleneck/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix index 3cbb5cf32d27..0fc0f176ea4e 100644 --- a/pkgs/development/python-modules/bottleneck/default.nix +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -9,13 +9,15 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bottleneck"; version = "1.6.0"; pyproject = true; + __structuredAttrs = true; + src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Ao1G7ksCWtmrTXmSQROBb4JfYrF7h8nh0NjOFEpKDjE="; }; @@ -41,4 +43,4 @@ buildPythonPackage rec { license = lib.licenses.bsd2; maintainers = [ ]; }; -} +}) From 6874b4a20df56ed9268db249144ded5f6d75aefc Mon Sep 17 00:00:00 2001 From: Harinn Date: Sat, 6 Jun 2026 09:26:10 +0700 Subject: [PATCH 3/3] python3Packages.bottleneck: re-enable previously-disabled tests --- pkgs/development/python-modules/bottleneck/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix index 0fc0f176ea4e..9d655d87f282 100644 --- a/pkgs/development/python-modules/bottleneck/default.nix +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -33,8 +33,6 @@ buildPythonPackage (finalAttrs: { preCheck = "pushd $out"; postCheck = "popd"; - disabledTests = [ "test_make_c_files" ]; - pythonImportsCheck = [ "bottleneck" ]; meta = {