From 89367b288689bb4da17a43d8fde71441dd919221 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 May 2024 11:25:09 +0200 Subject: [PATCH] python312Packages.wktutils: refactor --- .../python-modules/wktutils/default.nix | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/wktutils/default.nix b/pkgs/development/python-modules/wktutils/default.nix index 6b78ba959946..1324922e2743 100644 --- a/pkgs/development/python-modules/wktutils/default.nix +++ b/pkgs/development/python-modules/wktutils/default.nix @@ -3,15 +3,14 @@ , dateparser , defusedxml , fetchFromGitHub -, fiona , geomet , geopandas , kml2geojson , pyshp , pythonOlder , pyyaml -, regex , requests +, setuptools-scm , shapely , scikit-learn }: @@ -19,7 +18,7 @@ buildPythonPackage rec { pname = "wktutils"; version = "2.0.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -30,25 +29,32 @@ buildPythonPackage rec { hash = "sha256-mB+joEZq/aFPcRqFAzPgwG26Wi7WiRCeQeFottk+4Ho="; }; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"twine",' "" + ''; + + build-system = [ + setuptools-scm + ]; + + dependencies = [ dateparser defusedxml - fiona geomet geopandas kml2geojson pyshp pyyaml - regex - requests shapely - scikit-learn ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "sklearn" "scikit-learn" - ''; + passthru.optional-dependencies = { + extras = [ + requests + scikit-learn + ]; + }; # Module doesn't have tests doCheck = false; @@ -60,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Collection of tools for handling WKTs"; homepage = "https://github.com/asfadmin/Discovery-WKTUtils"; + changelog = "https://github.com/asfadmin/Discovery-WKTUtils/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; };