From f7fc20b39d43d463cfff06781d61d50afbefe108 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Feb 2025 22:55:01 +0000 Subject: [PATCH 1/2] python312Packages.stevedore: 5.4.0 -> 5.4.1 --- .../python-modules/stevedore/default.nix | 14 ++++---------- .../development/python-modules/stevedore/tests.nix | 2 -- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index 3e6d8669e475..616483424c0f 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -4,21 +4,20 @@ callPackage, fetchPypi, pythonOlder, - importlib-metadata, pbr, setuptools, }: buildPythonPackage rec { pname = "stevedore"; - version = "5.4.0"; + version = "5.4.1"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-eekiNey4KP6VK2uLDGyHhjJIYxkiyOjg+lsXsjLEUU0="; + hash = "sha256-MTW1rlD+EoFu8pG6/0IKy3J/zTVhBuPpy/qeWYXNb0s="; }; build-system = [ @@ -26,11 +25,6 @@ buildPythonPackage rec { setuptools ]; - dependencies = [ - importlib-metadata - setuptools - ]; - # Checks moved to 'passthru.tests' to workaround infinite recursion doCheck = false; @@ -42,8 +36,8 @@ buildPythonPackage rec { meta = with lib; { description = "Manage dynamic plugins for Python applications"; - homepage = "https://docs.openstack.org/stevedore/"; + homepage = "https://github.com/openstack/stevedore"; license = licenses.asl20; - maintainers = teams.openstack.members ++ (with maintainers; [ fab ]); + maintainers = teams.openstack.members; }; } diff --git a/pkgs/development/python-modules/stevedore/tests.nix b/pkgs/development/python-modules/stevedore/tests.nix index 7ae013a6e241..4a07c9555fa4 100644 --- a/pkgs/development/python-modules/stevedore/tests.nix +++ b/pkgs/development/python-modules/stevedore/tests.nix @@ -1,6 +1,5 @@ { buildPythonPackage, - docutils, sphinx, stestr, stevedore, @@ -15,7 +14,6 @@ buildPythonPackage { dontInstall = true; nativeCheckInputs = [ - docutils sphinx stestr stevedore From b5fcf6a9f591632a8a8b3c104f48049155579a05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 26 Feb 2025 19:15:24 +0100 Subject: [PATCH 2/2] python313Packages.oslo-db: fix tests --- pkgs/development/python-modules/oslo-db/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/oslo-db/default.nix b/pkgs/development/python-modules/oslo-db/default.nix index d8de84e8aa16..255f83a3dfe4 100644 --- a/pkgs/development/python-modules/oslo-db/default.nix +++ b/pkgs/development/python-modules/oslo-db/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + aiosqlite, alembic, debtcollector, oslo-config, @@ -46,6 +47,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + aiosqlite oslo-context oslotest stestr @@ -55,7 +57,7 @@ buildPythonPackage rec { ]; checkPhase = '' - stestr run + stestr run -e <(echo "oslo_db.tests.sqlalchemy.test_utils.TestModelQuery.test_project_filter_allow_none") ''; pythonImportsCheck = [ "oslo_db" ];