From ca8db5375d48e0d8e91515fe0dd8dd7bdb4ebb09 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 26 Oct 2024 12:35:21 +0200
Subject: [PATCH 1/2] python312Packages.owslib: 0.31.0 -> 0.32.0

Diff: geopython/OWSLib@refs/tags/0.31.0...0.32.0

Changelog: https://github.com/geopython/OWSLib/releases/tag/0.32.0
---
 .../python-modules/owslib/default.nix         | 35 +++++++++++--------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix
index 53f7f9f24e076..4d2d4f24071e5 100644
--- a/pkgs/development/python-modules/owslib/default.nix
+++ b/pkgs/development/python-modules/owslib/default.nix
@@ -2,46 +2,48 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-
   lxml,
-  pyproj,
+  pytest-cov-stub,
   pytestCheckHook,
   python-dateutil,
   pythonOlder,
-  pytz,
   pyyaml,
   requests,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "owslib";
-  version = "0.31.0";
-  format = "setuptools";
+  version = "0.32.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "geopython";
     repo = "OWSLib";
-    rev = version;
-    hash = "sha256-vjJsLavVOqTTrVtYbtA0G+nl0HanKeGtzNFFj92Frw8=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-q2O9FNBszNWfL1ekcohSd1RbdLFu8c+zxi+UFeQ7/mk=";
   };
 
   postPatch = ''
     substituteInPlace tox.ini \
-      --replace " --doctest-modules --doctest-glob 'tests/**/*.txt' --cov-report term-missing --cov owslib" ""
+      --replace-fail " --doctest-modules --doctest-glob 'tests/**/*.txt'" ""
   '';
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     lxml
-    pyproj
     python-dateutil
-    pytz
     pyyaml
     requests
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytest-cov-stub
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "owslib" ];
 
@@ -51,10 +53,15 @@ buildPythonPackage rec {
   '';
 
   pytestFlagsArray = [
-    # disable tests which require network access
+    # Disable tests which require network access
     "-m 'not online'"
   ];
 
+  disabledTestPaths = [
+    # Tests requires network access
+    "tests/test_ogcapi_connectedsystems_osh.py"
+  ];
+
   meta = with lib; {
     description = "Client for Open Geospatial Consortium web service interface standards";
     homepage = "https://www.osgeo.org/projects/owslib/";

From ca91895a0477631793224799280db865dc964706 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 27 Oct 2024 11:00:48 +0100
Subject: [PATCH 2/2] python312Packages.cartopy: 0.23.0 -> 0.24.1

Changelog: https://github.com/SciTools/cartopy/releases/tag/v0.24.1
---
 .../python-modules/cartopy/default.nix        | 54 +++++++++----------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix
index 5f7659b61346f..79059c7d53f5f 100644
--- a/pkgs/development/python-modules/cartopy/default.nix
+++ b/pkgs/development/python-modules/cartopy/default.nix
@@ -1,55 +1,50 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
+  cython,
   fetchpatch,
   fetchPypi,
-  cython,
-  setuptools-scm,
+  fontconfig,
+  gdal,
   geos,
-  proj,
   matplotlib,
   numpy,
-  pyproj,
-  pyshp,
-  shapely,
   owslib,
   pillow,
-  gdal,
-  scipy,
-  fontconfig,
+  proj,
+  pyproj,
+  pyshp,
   pytest-mpl,
   pytestCheckHook,
+  pythonOlder,
+  scipy,
+  setuptools-scm,
+  shapely,
 }:
 
 buildPythonPackage rec {
   pname = "cartopy";
-  version = "0.23.0";
-
-  disabled = pythonOlder "3.8";
+  version = "0.24.1";
+  pyproject = true;
 
-  format = "setuptools";
+  disabled = pythonOlder "3.10";
 
   src = fetchPypi {
-    inherit version;
-    pname = "Cartopy";
-    hash = "sha256-Ix83s1cB8rox2UlZzKdebaBMLuo6fxTOHHXuOw6udnY=";
+    inherit pname version;
+    hash = "sha256-AckQ1WNMaafv3sRuChfUc9Iyh2fwAdTcC1xLSOWFyL0=";
   };
 
-  patches = [
-    # Some tests in the 0.23.0 release are failing due to missing network markers. Revisit after update.
-    (fetchpatch {
-      name = "mnt-add-missing-needs-network-markers.patch";
-      url = "https://github.com/SciTools/cartopy/commit/2403847ea69c3d95e899ad5d0cab32ac6017df0e.patch";
-      hash = "sha256-aGBUX4jFn7GgoqmHVC51DmS+ga3GcQGKfkut++x67Q0=";
-    })
-  ];
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "numpy>=2.0.0rc1" "numpy"
+  '';
+
+  build-system = [ setuptools-scm ];
 
   nativeBuildInputs = [
     cython
     geos # for geos-config
     proj
-    setuptools-scm
   ];
 
   buildInputs = [
@@ -57,7 +52,7 @@ buildPythonPackage rec {
     proj
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     matplotlib
     numpy
     pyproj
@@ -101,9 +96,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Process geospatial data to create maps and perform analyses";
-    mainProgram = "feature_download";
-    license = licenses.lgpl3Plus;
     homepage = "https://scitools.org.uk/cartopy/docs/latest/";
+    changelog = "https://github.com/SciTools/cartopy/releases/tag/v${version}";
+    license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ ];
+    mainProgram = "feature_download";
   };
 }