From 2a522cfa37b3238bb6fabee0084b5012d8681a6e Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 10 Jan 2025 23:52:46 +0900 Subject: [PATCH 1/2] python312Packages.tess: unstable-2019-05-17 -> 0.3.1 --- pkgs/development/python-modules/tess/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/tess/default.nix b/pkgs/development/python-modules/tess/default.nix index d0443f82392a..9b7a543ec708 100644 --- a/pkgs/development/python-modules/tess/default.nix +++ b/pkgs/development/python-modules/tess/default.nix @@ -1,22 +1,20 @@ { lib, buildPythonPackage, - fetchFromGitHub, + fetchPypi, cython, numpy, scipy, }: -buildPythonPackage { +buildPythonPackage rec { pname = "tess"; - version = "unstable-2019-05-07"; + version = "0.3.1"; format = "setuptools"; - src = fetchFromGitHub { - owner = "wackywendell"; - repo = "tess"; - rev = "22c19df952732f9749637d1bf6d7b676b6c7b26c"; - sha256 = "0pj18nrfx749fjc6bjdk5r3g1104c6jy6xg7jrpmssllhypbb1m4"; + src = fetchPypi { + inherit pname version; + hash = "sha256-5Ic06+K7CWRh1t2v3aJ5JlBACvHXqQyYzvU71jZJFtI="; }; buildInputs = [ cython ]; From 867e93e80cbd19d2a2af1a7525bfec889e2bd3f6 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 10 Jan 2025 23:58:09 +0900 Subject: [PATCH 2/2] python312Packages.tess: refactor --- .../python-modules/tess/default.nix | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/tess/default.nix b/pkgs/development/python-modules/tess/default.nix index 9b7a543ec708..aa7608b5e62c 100644 --- a/pkgs/development/python-modules/tess/default.nix +++ b/pkgs/development/python-modules/tess/default.nix @@ -3,31 +3,47 @@ buildPythonPackage, fetchPypi, cython, + setuptools, numpy, scipy, + pytestCheckHook, + python, }: buildPythonPackage rec { pname = "tess"; version = "0.3.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-5Ic06+K7CWRh1t2v3aJ5JlBACvHXqQyYzvU71jZJFtI="; }; - buildInputs = [ cython ]; + build-system = [ + cython + setuptools + ]; - propagatedBuildInputs = [ + dependencies = [ numpy scipy ]; - meta = with lib; { + pythonImportsCheck = [ "tess" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "tess/tests.py" ]; + + preCheck = '' + cd $out/${python.sitePackages} + ''; + + meta = { description = "Module for calculating and analyzing Voronoi tessellations"; homepage = "https://tess.readthedocs.org"; - license = licenses.bsd3; + license = lib.licenses.bsd3; maintainers = [ ]; }; }