diff --git a/pkgs/development/python-modules/pentapy/default.nix b/pkgs/development/python-modules/pentapy/default.nix new file mode 100644 index 000000000000..10132fe67107 --- /dev/null +++ b/pkgs/development/python-modules/pentapy/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + cython, + setuptools, + setuptools-scm, + + # dependencies + numpy, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "pentapy"; + version = "1.4.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "GeoStat-Framework"; + repo = "pentapy"; + tag = "v${version}"; + hash = "sha256-lw512rZCrwumDunoWFfd0HxCv0HAn/bAmIz8l8VeBP8="; + }; + + build-system = [ + cython + numpy + setuptools + setuptools-scm + ]; + + dependencies = [ + numpy + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "A Python toolbox for pentadiagonal linear systems"; + homepage = "https://github.com/GeoStat-Framework/pentapy"; + changelog = "https://github.com/GeoStat-Framework/pentapy/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; + teams = [ lib.teams.geospatial ]; + }; +} diff --git a/pkgs/development/python-modules/pykrige/default.nix b/pkgs/development/python-modules/pykrige/default.nix index 477d55aaecb9..be69db1358b1 100644 --- a/pkgs/development/python-modules/pykrige/default.nix +++ b/pkgs/development/python-modules/pykrige/default.nix @@ -5,6 +5,7 @@ # build-system cython, + pentapy, setuptools, setuptools-scm, @@ -21,25 +22,20 @@ buildPythonPackage rec { pname = "pykrige"; - version = "1.7.2"; + version = "1.7.3"; pyproject = true; src = fetchFromGitHub { owner = "GeoStat-Framework"; repo = "PyKrige"; tag = "v${version}"; - hash = "sha256-9f8SNlt4qiTlXgx2ica9Y8rmnYzQ5VarvFRfoZ9bSsY="; + hash = "sha256-zdszmT1LEfYBWzd+m2nITtl0lZHyU0fzszYxANQS6yU="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "numpy>=2.0.0rc1,<2.3; python_version >= '3.9'" "numpy>=2.0.0" \ - --replace-fail "Cython>=3.0.10,<3.1.0" "Cython>=3.1.0,<4.0.0" - ''; - build-system = [ cython numpy + pentapy scipy setuptools setuptools-scm @@ -70,6 +66,6 @@ buildPythonPackage rec { homepage = "https://github.com/GeoStat-Framework/PyKrige"; changelog = "https://github.com/GeoStat-Framework/PyKrige/blob/v${version}/CHANGELOG.md"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.sikmir ]; + teams = [ lib.teams.geospatial ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 05598010be5c..99063ca44ce4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11804,6 +11804,8 @@ self: super: with self; { pendulum = callPackage ../development/python-modules/pendulum { }; + pentapy = callPackage ../development/python-modules/pentapy { }; + pep440 = callPackage ../development/python-modules/pep440 { }; pep517 = callPackage ../development/python-modules/pep517 { };