diff --git a/pkgs/development/python-modules/osprofiler/default.nix b/pkgs/development/python-modules/osprofiler/default.nix index f4eb83ef4c3c..8e480eabcc73 100644 --- a/pkgs/development/python-modules/osprofiler/default.nix +++ b/pkgs/development/python-modules/osprofiler/default.nix @@ -1,26 +1,34 @@ { lib, buildPythonPackage, + ddt, + docutils, + elasticsearch, fetchPypi, netaddr, + opentelemetry-exporter-otlp, + opentelemetry-sdk, oslo-concurrency, oslo-config, oslo-serialization, oslo-utils, prettytable, + pymongo, + redis, requests, setuptools, + stestrCheckHook, webob, }: buildPythonPackage rec { pname = "osprofiler"; - version = "4.3.0"; + version = "4.4.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-d6jaKyO7X5BIBUvVzMRdCshFdMqKiO8SC4+sbohk4kw="; + hash = "sha256-bgjffu9q/A0tAngT1A5DyyKPDrPrNEHWFJXCgA6/oyA="; }; build-system = [ setuptools ]; @@ -36,11 +44,16 @@ buildPythonPackage rec { webob ]; - # NOTE(vinetos): OSProfiler depends on jeager-client which use opentracing - # Opentracing and jeager-client are archived since 2022. - # As this package is made only to support old OpenStack clients and bindings, - # We do not really care - doCheck = false; + nativeCheckInputs = [ + ddt + docutils + elasticsearch + opentelemetry-exporter-otlp + opentelemetry-sdk + pymongo + redis + stestrCheckHook + ]; pythonImportsCheck = [ "osprofiler" ]; diff --git a/pkgs/development/python-modules/python-mistralclient/default.nix b/pkgs/development/python-modules/python-mistralclient/default.nix index 51ea1a97ce52..4ec57797a9bf 100644 --- a/pkgs/development/python-modules/python-mistralclient/default.nix +++ b/pkgs/development/python-modules/python-mistralclient/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, cliff, fetchFromGitHub, + fetchpatch, keystoneauth1, openstackdocstheme, openstacksdk, @@ -36,6 +37,14 @@ buildPythonPackage rec { hash = "sha256-FNfee7d8gTcsTdv7lxqDbniUiKQvUXHRSkAlNOCn/k4="; }; + patches = [ + # Fix unit test failure caused by osprofiler 4.4.0 + (fetchpatch { + url = "https://github.com/openstack/python-mistralclient/commit/4cee2bb25a4d15e7dd1802f3e7e75520177446db.patch"; + hash = "sha256-H8JSvPFcHZJsnIWpV0WPvkqyvmg8SBbpsUzqcZeFBwA="; + }) + ]; + env.PBR_VERSION = version; nativeBuildInputs = [ @@ -83,7 +92,7 @@ buildPythonPackage rec { meta = { description = "OpenStack Mistral Command-line Client"; - homepage = "https://opendev.org/openstack/python-mistralclient/"; + homepage = "https://github.com/openstack/python-mistralclient"; license = lib.licenses.asl20; mainProgram = "mistral"; teams = [ lib.teams.openstack ];