From ade0e5bd30a4ddf38f984312df7637be1d1d6dfd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Jun 2021 00:06:34 +0200 Subject: [PATCH 1/7] python3Packages.aio-geojson-client: init at 0.14 --- .../aio-geojson-client/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/aio-geojson-client/default.nix diff --git a/pkgs/development/python-modules/aio-geojson-client/default.nix b/pkgs/development/python-modules/aio-geojson-client/default.nix new file mode 100644 index 000000000000..2c64230db266 --- /dev/null +++ b/pkgs/development/python-modules/aio-geojson-client/default.nix @@ -0,0 +1,45 @@ +{ lib +, aiohttp +, aresponses +, asynctest +, buildPythonPackage +, fetchFromGitHub +, geojson +, haversine +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aio-geojson-client"; + version = "0.14"; + + src = fetchFromGitHub { + owner = "exxamalte"; + repo = "python-aio-geojson-client"; + rev = "v${version}"; + sha256 = "1nk0mas71n1bn4wc7pcv279i1b5mxy9phyc8ppxlb16kbjnjj0h8"; + }; + + propagatedBuildInputs = [ + aiohttp + geojson + haversine + ]; + + checkInputs = [ + aresponses + asynctest + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "aio_geojson_client" ]; + + meta = with lib; { + description = "Python module for accessing GeoJSON feeds"; + homepage = "https://github.com/exxamalte/python-aio-geojson-client"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c76f3753ad55..e8a4e27578ad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -225,6 +225,8 @@ in { agent-py = callPackage ../development/python-modules/agent-py { }; + aio-geojson-client = callPackage ../development/python-modules/aio-geojson-client { }; + aio-georss-client = callPackage ../development/python-modules/aio-georss-client { }; aio-georss-gdacs = callPackage ../development/python-modules/aio-georss-gdacs { }; From 1d948b071d03fc94f5faf22626af6938ff9532f3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Jun 2021 00:14:12 +0200 Subject: [PATCH 2/7] python3Packages.aio-geojson-geonetnz-quakes: init at 0.12 --- .../aio-geojson-geonetnz-quakes/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix new file mode 100644 index 000000000000..2def7919fa11 --- /dev/null +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix @@ -0,0 +1,43 @@ +{ lib +, aio-geojson-client +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pytz +}: + +buildPythonPackage rec { + pname = "aio-geojson-geonetnz-quakes"; + version = "0.12"; + + src = fetchFromGitHub { + owner = "exxamalte"; + repo = "python-aio-geojson-geonetnz-quakes"; + rev = "v${version}"; + sha256 = "166gvcc1rzigb822k1373y18k54x5aklikr8sc7hyml5vz937xr7"; + }; + + propagatedBuildInputs = [ + aio-geojson-client + aiohttp + pytz + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "aio_geojson_geonetnz_quakes" ]; + + meta = with lib; { + description = "Python module for accessing the GeoNet NZ Quakes GeoJSON feeds"; + homepage = "https://github.com/exxamalte/pythonaio-geojson-geonetnz-quakes"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e8a4e27578ad..10a9c4868ef6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -227,6 +227,8 @@ in { aio-geojson-client = callPackage ../development/python-modules/aio-geojson-client { }; + aio-geojson-geonetnz-quakes = callPackage ../development/python-modules/aio-geojson-geonetnz-quakes { }; + aio-georss-client = callPackage ../development/python-modules/aio-georss-client { }; aio-georss-gdacs = callPackage ../development/python-modules/aio-georss-gdacs { }; From 41e46438efcdd867c03f568448a13fc90ea245b3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Jun 2021 00:18:02 +0200 Subject: [PATCH 3/7] python3Packages.aio-geojson-geonetnz-volcano: init at 0.5 --- .../aio-geojson-geonetnz-volcano/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix new file mode 100644 index 000000000000..97adb2f8fe07 --- /dev/null +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix @@ -0,0 +1,45 @@ +{ lib +, aio-geojson-client +, aiohttp +, aresponses +, asynctest +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pytz +}: + +buildPythonPackage rec { + pname = "aio-geojson-geonetnz-volcano"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "exxamalte"; + repo = "python-aio-geojson-geonetnz-volcano"; + rev = "v${version}"; + sha256 = "0x4i9gjwb2j788aw4j47bxin0d2ma3khssprq4ga3cjzx2qjwjvn"; + }; + + propagatedBuildInputs = [ + aio-geojson-client + aiohttp + pytz + ]; + + checkInputs = [ + aresponses + asynctest + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "aio_geojson_geonetnz_volcano" ]; + + meta = with lib; { + description = "Python module for accessing the GeoNet NZ Volcanic GeoJSON feeds"; + homepage = "https://github.com/exxamalte/pythonaio-geojson-geonetnz-volcano"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 10a9c4868ef6..3644a8eef02d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -229,6 +229,8 @@ in { aio-geojson-geonetnz-quakes = callPackage ../development/python-modules/aio-geojson-geonetnz-quakes { }; + aio-geojson-geonetnz-volcano = callPackage ../development/python-modules/aio-geojson-geonetnz-volcano { }; + aio-georss-client = callPackage ../development/python-modules/aio-georss-client { }; aio-georss-gdacs = callPackage ../development/python-modules/aio-georss-gdacs { }; From 0f28f4e8a052426f86320e6da2936dca5038d9c1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Jun 2021 00:22:47 +0200 Subject: [PATCH 4/7] python3Packages.aio-geojson-nsw-rfs-incidents: init at 0.3 --- .../aio-geojson-nsw-rfs-incidents/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix 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 new file mode 100644 index 000000000000..845f0fec8cde --- /dev/null +++ b/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix @@ -0,0 +1,45 @@ +{ lib +, aio-geojson-client +, aiohttp +, aresponses +, asynctest +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pytz +}: + +buildPythonPackage rec { + pname = "aio-geojson-nsw-rfs-incidents"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "exxamalte"; + repo = "python-aio-geojson-nsw-rfs-incidents"; + rev = "v${version}"; + sha256 = "0g7a5sbp1y4shhsik924zssa2n7ima6p2zk1l890y66lyc168vws"; + }; + + propagatedBuildInputs = [ + aio-geojson-client + aiohttp + pytz + ]; + + checkInputs = [ + aresponses + asynctest + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "aio_geojson_nsw_rfs_incidents" ]; + + 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"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3644a8eef02d..a84a3adfb507 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -231,6 +231,8 @@ in { aio-geojson-geonetnz-volcano = callPackage ../development/python-modules/aio-geojson-geonetnz-volcano { }; + aio-geojson-nsw-rfs-incidents = callPackage ../development/python-modules/aio-geojson-nsw-rfs-incidents { }; + aio-georss-client = callPackage ../development/python-modules/aio-georss-client { }; aio-georss-gdacs = callPackage ../development/python-modules/aio-georss-gdacs { }; From ce1a051d13fcb6eb1d2cf35c084fdd77e41c0164 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Jun 2021 12:14:18 +0200 Subject: [PATCH 5/7] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index f7f5f589f62a..e62d3dbcf4b0 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -303,8 +303,8 @@ "geo_location" = ps: with ps; [ ]; "geo_rss_events" = ps: with ps; [ georss-generic-client ]; "geofency" = ps: with ps; [ aiohttp-cors ]; - "geonetnz_quakes" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_quakes - "geonetnz_volcano" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_volcano + "geonetnz_quakes" = ps: with ps; [ aio-geojson-geonetnz-quakes ]; + "geonetnz_volcano" = ps: with ps; [ aio-geojson-geonetnz-volcano ]; "gios" = ps: with ps; [ gios ]; "github" = ps: with ps; [ PyGithub ]; "gitlab_ci" = ps: with ps; [ python-gitlab ]; @@ -576,7 +576,7 @@ "notify_events" = ps: with ps; [ ]; # missing inputs: notify-events "notion" = ps: with ps; [ aionotion ]; "nsw_fuel_station" = ps: with ps; [ ]; # missing inputs: nsw-fuel-api-client - "nsw_rural_fire_service_feed" = ps: with ps; [ ]; # missing inputs: aio_geojson_nsw_rfs_incidents + "nsw_rural_fire_service_feed" = ps: with ps; [ aio-geojson-nsw-rfs-incidents ]; "nuheat" = ps: with ps; [ ]; # missing inputs: nuheat "nuki" = ps: with ps; [ pynuki ]; "numato" = ps: with ps; [ ]; # missing inputs: numato-gpio From 2680c5c780c35fc8ceefa40e78a6c2fd9fb5dfce Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Jun 2021 12:20:28 +0200 Subject: [PATCH 6/7] home-assistant: enable geo* tests --- pkgs/servers/home-assistant/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index da3e16b0a209..551ab4dedf64 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -391,7 +391,10 @@ in with py.pkgs; buildPythonApplication rec { "generic_thermostat" "geo_json_events" "geo_location" + "geo_rss_events" "geofency" + "geonetnz_quakes" + "geonetnz_volcano" "glances" "gios" "gogogate2" @@ -505,6 +508,7 @@ in with py.pkgs; buildPythonApplication rec { "no_ip" "notify" "notion" + "nsw_rural_fire_service_feed" "nuki" "number" "nws" From d97fa35f946476a13ed4d59f62c354baf73b3c88 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Jun 2021 12:22:00 +0200 Subject: [PATCH 7/7] python3Packages.aio-geojson-nsw-rfs-incidents: 0.3 -> 0.4 --- .../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 845f0fec8cde..792f91bc7f11 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 @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "aio-geojson-nsw-rfs-incidents"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-nsw-rfs-incidents"; rev = "v${version}"; - sha256 = "0g7a5sbp1y4shhsik924zssa2n7ima6p2zk1l890y66lyc168vws"; + sha256 = "sha256-o9tuoJ7VZ6bg0rYeRWClKxdbxxj6wPgkSF7ZdOfmJew="; }; propagatedBuildInputs = [