From bbec4751826325cba268f10cb5c0e1565e44bce4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Oct 2024 09:21:02 +0200 Subject: [PATCH 01/13] python312Packages.aio-geojson-client: 0.20 -> 0.21 Diff: https://github.com/exxamalte/python-aio-geojson-client/compare/refs/tags/v0.20...v0.21 Changelog: https://github.com/exxamalte/python-aio-geojson-client/blob/v0.21/CHANGELOG.md --- .../development/python-modules/aio-geojson-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aio-geojson-client/default.nix b/pkgs/development/python-modules/aio-geojson-client/default.nix index 4034699d2d29..ae8915723a3d 100644 --- a/pkgs/development/python-modules/aio-geojson-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-client/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aio-geojson-client"; - version = "0.20"; + version = "0.21"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-geojson-client"; rev = "refs/tags/v${version}"; - hash = "sha256-GASjsOCZ4lSK0+VtIuVxFNxjMCbHkUGy/KSBtGLSaXw="; + hash = "sha256-zHgqsl278XBr2X8oQOsnIQxfyYuB5G8NLcTNy4oerUI="; }; __darwinAllowLocalNetworking = true; From 5624365e6d5bae3f35632682bf00b43c9c53795c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Oct 2024 09:21:20 +0200 Subject: [PATCH 02/13] python312Packages.aio-geojson-generic-client: 0.4 -> 0.5 Diff: https://github.com/exxamalte/python-aio-geojson-generic-client/compare/refs/tags/v0.4...v0.5 Changelog: https://github.com/exxamalte/python-aio-geojson-generic-client/blob/v0.5/CHANGELOG.md --- .../python-modules/aio-geojson-generic-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix index c47ea3e7cf57..60d31cc40340 100644 --- a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aio-geojson-generic-client"; - version = "0.4"; + version = "0.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-geojson-generic-client"; rev = "refs/tags/v${version}"; - hash = "sha256-065aPocJFOTn+naedxRJ7U/b7hjrYViu2MEUsBpQ9cY="; + hash = "sha256-/I/n/XXRvm7G16WqVmU+KkyP5DeadqhEpy2EAtDFlCk="; }; __darwinAllowLocalNetworking = true; From b3dd3dad73732ca433818769eb79b2b49731b6b8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Oct 2024 09:21:33 +0200 Subject: [PATCH 03/13] python312Packages.aio-geojson-geonetnz-quakes: 0.16 -> 0.17 Diff: https://github.com/exxamalte/python-aio-geojson-geonetnz-quakes/compare/refs/tags/v0.16...v0.17 Changelog: https://github.com/exxamalte/python-aio-geojson-geonetnz-quakes/blob/v0.17/CHANGELOG.md --- .../python-modules/aio-geojson-geonetnz-quakes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix index f9dd37f5653a..995f81168c5c 100644 --- a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aio-geojson-geonetnz-quakes"; - version = "0.16"; + version = "0.17"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-geojson-geonetnz-quakes"; rev = "refs/tags/v${version}"; - hash = "sha256-8OpmA3yHjUY+N5Obri4RWeuJiW916xGSWUYUgdpmjkw="; + hash = "sha256-RZ+wgLYMl7y3CdmlipsfZGcew1pYSMEhkyyeLqIwVwI="; }; nativeBuildInputs = [ setuptools ]; From 08a4f79828e9cb0b1afa644c8ef0939910af48d7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Oct 2024 09:21:47 +0200 Subject: [PATCH 04/13] python312Packages.aio-geojson-geonetnz-volcano: 0.9 -> 0.10 Diff: https://github.com/exxamalte/python-aio-geojson-geonetnz-volcano/compare/refs/tags/v0.9...v0.10 Changelog: https://github.com/exxamalte/python-aio-geojson-geonetnz-volcano/blob/v0.10/CHANGELOG.md --- .../python-modules/aio-geojson-geonetnz-volcano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix index 6050107c9acf..d8c1db3b0f44 100644 --- a/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aio-geojson-geonetnz-volcano"; - version = "0.9"; + version = "0.10"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-geojson-geonetnz-volcano"; rev = "refs/tags/v${version}"; - hash = "sha256-ZmGDO9EROFMlxdj5txNh719M+3l/0jRFbB2h2AyZAdI="; + hash = "sha256-B+jULYeel7efk7fB26zXQyS1ZCsmFVKlOkfnKWFQFJ4="; }; nativeBuildInputs = [ setuptools ]; From cc9e89c2aaaa4e0d2675ff41910e60667de41ed5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Oct 2024 09:21:58 +0200 Subject: [PATCH 05/13] python312Packages.aio-geojson-nsw-rfs-incidents: 0.7 -> 0.8 Diff: https://github.com/exxamalte/python-aio-geojson-nsw-rfs-incidents/compare/refs/tags/v0.7...v0.8 Changelog: https://github.com/exxamalte/python-aio-geojson-geonetnz-quakes/blob/v0.8/CHANGELOG.md --- .../python-modules/aio-geojson-nsw-rfs-incidents/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix b/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix index 2341e515a01e..1aaf3c1bbfc0 100644 --- a/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix +++ b/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aio-geojson-nsw-rfs-incidents"; - version = "0.7"; + version = "0.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-geojson-nsw-rfs-incidents"; rev = "refs/tags/v${version}"; - hash = "sha256-HksiKfXhLASAgU81x7YiOXFmBLIkqJ9ldWLLY1ZbZlk="; + hash = "sha256-JOvmUWrmYQt2hJ9u08Aliv9ImI3AOTk4uBx3Pv8/7/c="; }; nativeBuildInputs = [ setuptools ]; From 51ac4cb51d1c4c3c9f4e97b9fca3bdad3971d960 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Oct 2024 09:22:11 +0200 Subject: [PATCH 06/13] python312Packages.aio-geojson-usgs-earthquakes: 0.3 -> 0.4 Diff: https://github.com/exxamalte/python-aio-geojson-usgs-earthquakes/compare/refs/tags/v0.3...v0.4 Changelog: https://github.com/exxamalte/python-aio-geojson-usgs-earthquakes/blob/v0.4/CHANGELOG.md --- .../python-modules/aio-geojson-usgs-earthquakes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix b/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix index 55a67843f1e9..e8e2991f5365 100644 --- a/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix +++ b/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aio-geojson-usgs-earthquakes"; - version = "0.3"; + version = "0.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-geojson-usgs-earthquakes"; rev = "refs/tags/v${version}"; - hash = "sha256-Q9vBy5R5N5ihJdSMALo88qVYcFVs2/33lYRPdLej4S8="; + hash = "sha256-UzLnctft/D38bqClqyyJ4b5GvVXM4CFSd6TypuLo0Y4="; }; nativeBuildInputs = [ setuptools ]; From ea38d6c1a1ad9e5aefb5179b83346cc61d6f2271 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Oct 2024 09:23:52 +0200 Subject: [PATCH 07/13] python312Packages.aio-geojson-usgs-earthquakes: refactor --- .../aio-geojson-usgs-earthquakes/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix b/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix index e8e2991f5365..b2386179b9bc 100644 --- a/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix +++ b/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix @@ -26,30 +26,29 @@ buildPythonPackage rec { hash = "sha256-UzLnctft/D38bqClqyyJ4b5GvVXM4CFSd6TypuLo0Y4="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aio-geojson-client aiohttp pytz ]; - __darwinAllowLocalNetworking = true; - - nativeCheckInputs = [ pytestCheckHook ]; - - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio + pytestCheckHook ]; pythonImportsCheck = [ "aio_geojson_usgs_earthquakes" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { - description = "Python module for accessing the U.S. Geological Survey Earthquake Hazards Program feeds"; + description = "Module for accessing the U.S. Geological Survey Earthquake Hazards Program feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-usgs-earthquakes"; changelog = "https://github.com/exxamalte/python-aio-geojson-usgs-earthquakes/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } From 8b2eae93d3b689c59601f8fc58bb31bc1814090f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Oct 2024 09:24:59 +0200 Subject: [PATCH 08/13] pytho312Packages.aio-geojson-nsw-rfs-incidents: refactor --- .../aio-geojson-nsw-rfs-incidents/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix b/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix index 1aaf3c1bbfc0..2e4903ab4910 100644 --- a/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix +++ b/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix @@ -26,16 +26,14 @@ buildPythonPackage rec { hash = "sha256-JOvmUWrmYQt2hJ9u08Aliv9ImI3AOTk4uBx3Pv8/7/c="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aio-geojson-client aiohttp pytz ]; - __darwinAllowLocalNetworking = true; - nativeCheckInputs = [ aioresponses pytest-asyncio @@ -44,11 +42,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "aio_geojson_nsw_rfs_incidents" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Python module for accessing the NSW Rural Fire Service incidents feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-nsw-rfs-incidents"; changelog = "https://github.com/exxamalte/python-aio-geojson-geonetnz-quakes/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } From 02adcfb8e1dffba47e767ca4c25fc1e0dde80504 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Oct 2024 09:26:21 +0200 Subject: [PATCH 09/13] python312Packages.aio-geojson-geonetnz-volcano: refactor --- .../aio-geojson-geonetnz-volcano/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix index d8c1db3b0f44..2726a9493576 100644 --- a/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { version = "0.10"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "exxamalte"; @@ -28,16 +28,14 @@ buildPythonPackage rec { hash = "sha256-B+jULYeel7efk7fB26zXQyS1ZCsmFVKlOkfnKWFQFJ4="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aio-geojson-client aiohttp pytz ]; - __darwinAllowLocalNetworking = true; - nativeCheckInputs = [ aioresponses mock @@ -48,11 +46,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "aio_geojson_geonetnz_volcano" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Python module for accessing the GeoNet NZ Volcanic GeoJSON feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-geonetnz-volcano"; changelog = "https://github.com/exxamalte/python-aio-geojson-geonetnz-volcano/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } From f44dfce217035f56b19cf61eabb5d97be36a2eda Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Oct 2024 09:27:37 +0200 Subject: [PATCH 10/13] python312Packages.aio-geojson-geonetnz-quakes: refactor --- .../aio-geojson-geonetnz-quakes/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix index 995f81168c5c..be94149d8263 100644 --- a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { version = "0.17"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "exxamalte"; @@ -26,16 +26,14 @@ buildPythonPackage rec { hash = "sha256-RZ+wgLYMl7y3CdmlipsfZGcew1pYSMEhkyyeLqIwVwI="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aio-geojson-client aiohttp pytz ]; - __darwinAllowLocalNetworking = true; - nativeCheckInputs = [ aioresponses pytest-asyncio @@ -44,11 +42,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "aio_geojson_geonetnz_quakes" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Python module for accessing the GeoNet NZ Quakes GeoJSON feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-geonetnz-quakes"; changelog = "https://github.com/exxamalte/python-aio-geojson-geonetnz-quakes/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } From d773149eb09a7b070a7e605c3365263dd1ade3b0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Oct 2024 09:28:55 +0200 Subject: [PATCH 11/13] python312Packages.aio-geojson-generic-client: refactor --- .../aio-geojson-generic-client/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix index 60d31cc40340..6ca27df746f6 100644 --- a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { version = "0.5"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "exxamalte"; @@ -29,16 +29,14 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; pythonRelaxDeps = [ # geojson>=2.4.0,<3, but we have 3.x "geojson" ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp aio-geojson-client geojson @@ -57,7 +55,7 @@ buildPythonPackage rec { description = "Python library for accessing GeoJSON feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-generic-client"; changelog = "https://github.com/exxamalte/python-aio-geojson-generic-client/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } From da8e896eb65939e3152572695dbe5575531d57f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Oct 2024 09:30:06 +0200 Subject: [PATCH 12/13] python312Packages.aio-geojson-client: refactor --- .../python-modules/aio-geojson-client/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aio-geojson-client/default.nix b/pkgs/development/python-modules/aio-geojson-client/default.nix index ae8915723a3d..cfc7746970ef 100644 --- a/pkgs/development/python-modules/aio-geojson-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { version = "0.21"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "exxamalte"; @@ -29,9 +29,9 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp geojson haversine @@ -50,7 +50,7 @@ buildPythonPackage rec { description = "Python module for accessing GeoJSON feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-client"; changelog = "https://github.com/exxamalte/python-aio-geojson-client/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } From c91aae2f72585b18fef8ac5a9fb2e6e227bf03ad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Oct 2024 11:07:27 +0200 Subject: [PATCH 13/13] python312Packages.aio-geojson-client: relax geojson --- pkgs/development/python-modules/aio-geojson-client/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/aio-geojson-client/default.nix b/pkgs/development/python-modules/aio-geojson-client/default.nix index cfc7746970ef..0f1a069056f8 100644 --- a/pkgs/development/python-modules/aio-geojson-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-client/default.nix @@ -27,6 +27,8 @@ buildPythonPackage rec { hash = "sha256-zHgqsl278XBr2X8oQOsnIQxfyYuB5G8NLcTNy4oerUI="; }; + pythonRelaxDeps = [ "geojson" ]; + __darwinAllowLocalNetworking = true; build-system = [ setuptools ];