From 67f977d6c07907c939499262e36519fac6ca0947 Mon Sep 17 00:00:00 2001 From: Vinetos Date: Tue, 28 Jul 2026 17:05:19 +0200 Subject: [PATCH] python3Packages.aodhclient: 3.10.1 -> 3.11.0, rename from python3Packages.python-aodhclient to match python metadata Fixes #546708 --- .../{python-aodhclient => aodhclient}/default.nix | 8 ++++---- .../{python-aodhclient => aodhclient}/fix-pyproject.patch | 0 .../python-modules/python-openstackclient/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) rename pkgs/development/python-modules/{python-aodhclient => aodhclient}/default.nix (90%) rename pkgs/development/python-modules/{python-aodhclient => aodhclient}/fix-pyproject.patch (100%) diff --git a/pkgs/development/python-modules/python-aodhclient/default.nix b/pkgs/development/python-modules/aodhclient/default.nix similarity index 90% rename from pkgs/development/python-modules/python-aodhclient/default.nix rename to pkgs/development/python-modules/aodhclient/default.nix index f810ef9fc00e..49bcde20b2cc 100644 --- a/pkgs/development/python-modules/python-aodhclient/default.nix +++ b/pkgs/development/python-modules/aodhclient/default.nix @@ -30,15 +30,15 @@ }: buildPythonPackage (finalAttrs: { - pname = "python-aodhclient"; - version = "3.10.1"; + pname = "aodhclient"; + version = "3.11.0"; pyproject = true; src = fetchFromGitHub { owner = "openstack"; repo = "python-aodhclient"; tag = finalAttrs.version; - hash = "sha256-xm42ZicdBxxm4LTDHPhEIeNU6evBZtp2PGvGy6V2t8c="; + hash = "sha256-vyrs7QewZknxB1fovZQRhOJe3G9J5YEN4cIHeLrnvrU="; }; env.PBR_VERSION = finalAttrs.version; @@ -94,7 +94,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "Client library for OpenStack AOodh API"; homepage = "https://docs.openstack.org/python-aodhclient/latest/"; - downloadPage = "https://github.com/openstack/python-aodhclientz /releases/tag/${finalAttrs.src.tag}"; + downloadPage = "https://github.com/openstack/python-aodhclient/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; mainProgram = "aodh"; teams = [ lib.teams.openstack ]; diff --git a/pkgs/development/python-modules/python-aodhclient/fix-pyproject.patch b/pkgs/development/python-modules/aodhclient/fix-pyproject.patch similarity index 100% rename from pkgs/development/python-modules/python-aodhclient/fix-pyproject.patch rename to pkgs/development/python-modules/aodhclient/fix-pyproject.patch diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 5a008c978161..a9ac07f09333 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -9,7 +9,7 @@ osc-lib, osc-placement, pbr, - python-aodhclient, + aodhclient, python-barbicanclient, python-cinderclient, python-designateclient, @@ -98,8 +98,8 @@ buildPythonPackage (finalAttrs: { optional-dependencies = { # See https://github.com/openstack/python-openstackclient/blob/master/doc/source/contributor/plugins.rst cli-plugins = [ + aodhclient osc-placement - python-aodhclient python-barbicanclient python-designateclient python-heatclient diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 0dc1ed1a1f68..d5d25162c6ca 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -547,6 +547,7 @@ mapAliases { pytestcov = throw "'pytestcov' has been renamed to/replaced by 'pytest-cov'"; # Converted to throw 2025-10-29 pytestquickcheck = throw "'pytestquickcheck' has been renamed to/replaced by 'pytest-quickcheck'"; # Converted to throw 2025-10-29 pytestrunner = throw "'pytestrunner' has been renamed to/replaced by 'pytest-runner'"; # Converted to throw 2025-10-29 + python-aodhclient = aodhclient; # added 2026-07-28 python-bring-api = throw "python-bring-api was removed because Home Assistant switched to bring-api"; # added 2025-10-03 python-clementine-remote = throw "'python-clementine-remote' was removed because Home Assistant droppped the integration"; # Added 2026-06-04 python-ethtool = throw "'python-ethtool' has been renamed to/replaced by 'ethtool'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 89cded2a4bcb..a1fbd10da26e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1179,6 +1179,8 @@ self: super: with self; { aocd-example-parser = callPackage ../development/python-modules/aocd-example-parser { }; + aodhclient = callPackage ../development/python-modules/aodhclient { }; + apache-beam = callPackage ../development/python-modules/apache-beam { }; apache-tvm-ffi = callPackage ../development/python-modules/apache-tvm-ffi { }; @@ -16348,8 +16350,6 @@ self: super: with self; { python-aidot = callPackage ../development/python-modules/python-aidot { }; - python-aodhclient = callPackage ../development/python-modules/python-aodhclient { }; - python-apt = callPackage ../development/python-modules/python-apt { }; python-arango = callPackage ../development/python-modules/python-arango { };