From 8a631f2aa31d2fc02bdced2a3f492df2c8313b09 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Mar 2025 13:20:08 +0100 Subject: [PATCH] python312Packages.pysuez: drop Duplicate of pysuezv2. --- .../python-modules/pysuez/default.nix | 41 ------------------- .../home-assistant/component-packages.nix | 2 +- .../update-component-packages.py | 1 - pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 5 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 pkgs/development/python-modules/pysuez/default.nix diff --git a/pkgs/development/python-modules/pysuez/default.nix b/pkgs/development/python-modules/pysuez/default.nix deleted file mode 100644 index b4ffa898f9e4..000000000000 --- a/pkgs/development/python-modules/pysuez/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - hatchling, - aiohttp, - pythonOlder, -}: - -buildPythonPackage rec { - pname = "pysuez"; - version = "2.0.3"; - pyproject = true; - - disabled = pythonOlder "3.8"; - - src = fetchFromGitHub { - owner = "jb101010-2"; - repo = "pySuez"; - tag = version; - hash = "sha256-D/XsJL393fDIKMB1Wyzods5hLsdU3Qgq8T5aTJ3SLrM="; - }; - - build-system = [ hatchling ]; - - dependencies = [ aiohttp ]; - - # Module has no tests - doCheck = false; - - pythonImportsCheck = [ "pysuez" ]; - - meta = with lib; { - description = "Module to get water consumption data from Suez"; - mainProgram = "pysuez"; - homepage = "https://github.com/jb101010-2/pySuez"; - changelog = "https://github.com/jb101010-2/pySuez/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 3d52e828800d..93c296802c14 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -5427,7 +5427,7 @@ ]; "suez_water" = ps: with ps; [ - pysuez + pysuezv2 ]; "sun" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/update-component-packages.py b/pkgs/servers/home-assistant/update-component-packages.py index 747880254965..a6433c9b96b4 100755 --- a/pkgs/servers/home-assistant/update-component-packages.py +++ b/pkgs/servers/home-assistant/update-component-packages.py @@ -45,7 +45,6 @@ PKG_PREFERENCES = { "numpy": "numpy", "ollama-hass": "ollama", "paho-mqtt": "paho-mqtt", - "pysuezV2": "pysuez", "sentry-sdk": "sentry-sdk", "slackclient": "slack-sdk", "SQLAlchemy": "sqlalchemy", diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index ccf71248b1fc..ae5fdce752b2 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -563,6 +563,7 @@ mapAliases ({ pysparse = throw "pysparse has been abandoned upstream."; # added 2023-02-28 pyspotify = throw "pyspotify has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29 PyStemmer = pystemmer; # added 2023-02-19 + pysuez = pysuezv2; # added 2025-03-14 pytado = python-tado; # added 2024-12-02 pytest_6 = pytest; # added 2022-02-10 pytestcov = pytest-cov; # added 2021-01-04 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 53242b64023c..3772f9bda112 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11021,8 +11021,6 @@ self: super: with self; { pysubs2 = callPackage ../development/python-modules/pysubs2 { }; - pysuez = callPackage ../development/python-modules/pysuez { }; - pysuezv2 = callPackage ../development/python-modules/pysuezv2 { }; pysqlitecipher = callPackage ../development/python-modules/pysqlitecipher { };