From af3fb9d61b705c19527a4356e57b8aa52eb5fc3c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 4 Sep 2024 08:11:12 +0200
Subject: [PATCH] python312Packages.fiona: 1.9.6 -> 1.10.0

Diff: https://github.com/Toblerity/Fiona/compare/refs/tags/1.9.6...1.10.0

Changelog: https://github.com/Toblerity/Fiona/blob/refs/tags/1.10.0/CHANGES.txt
---
 .../python-modules/fiona/default.nix          | 48 +++++++++++--------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix
index 753bcc32278c..49076c4e5b4b 100644
--- a/pkgs/development/python-modules/fiona/default.nix
+++ b/pkgs/development/python-modules/fiona/default.nix
@@ -1,67 +1,75 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
+
+  # build-system
   cython,
   gdal,
-  oldest-supported-numpy,
   setuptools,
-  wheel,
+
+  # dependencies
   attrs,
   certifi,
   click,
   click-plugins,
   cligj,
-  munch,
+
+  # optional-dependencies
+  pyparsing,
   shapely,
   boto3,
+
+  # tests
+  fsspec,
   pytestCheckHook,
   pytz,
+  snuggs,
 }:
 
 buildPythonPackage rec {
   pname = "fiona";
-  version = "1.9.6";
+  version = "1.10.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "Toblerity";
     repo = "Fiona";
     rev = "refs/tags/${version}";
-    hash = "sha256-MboM3IwGF8cuz+jMQ3QVZFAHjpspQ6kVJincq7OEkCM=";
+    hash = "sha256-0Jiyq9x9YLDN1a1LBlCK2ac6kLZ5X2rOPusUQH5OPrQ=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     cython
     gdal # for gdal-config
-    oldest-supported-numpy
     setuptools
-    wheel
   ];
 
   buildInputs = [ gdal ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     attrs
     certifi
     click
-    cligj
     click-plugins
-    munch
+    cligj
   ];
 
-  passthru.optional-dependencies = {
-    calc = [ shapely ];
+  optional-dependencies = {
+    calc = [
+      pyparsing
+      shapely
+    ];
     s3 = [ boto3 ];
   };
 
   nativeCheckInputs = [
+    fsspec
     pytestCheckHook
     pytz
-  ] ++ passthru.optional-dependencies.s3;
+    shapely
+    snuggs
+  ] ++ optional-dependencies.s3;
 
   preCheck = ''
     rm -r fiona # prevent importing local fiona
@@ -87,12 +95,12 @@ buildPythonPackage rec {
 
   doInstallCheck = true;
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/Toblerity/Fiona/blob/${src.rev}/CHANGES.txt";
     description = "OGR's neat, nimble, no-nonsense API for Python";
     mainProgram = "fio";
     homepage = "https://fiona.readthedocs.io/";
-    license = licenses.bsd3;
-    maintainers = teams.geospatial.members;
+    license = lib.licenses.bsd3;
+    maintainers = lib.teams.geospatial.members;
   };
 }