From 2032774c51941c658f7ba13d4909a8358138dc77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Jun 2025 14:50:36 +0200 Subject: [PATCH 1/6] python313Packages.openstackdocstheme: drop disabled It works just fine on 3.13 and upstream is just slow updating the metadata. --- pkgs/development/python-modules/openstackdocstheme/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/openstackdocstheme/default.nix b/pkgs/development/python-modules/openstackdocstheme/default.nix index 3674840098b6..b2bf0e31080f 100644 --- a/pkgs/development/python-modules/openstackdocstheme/default.nix +++ b/pkgs/development/python-modules/openstackdocstheme/default.nix @@ -5,7 +5,6 @@ dulwich, pbr, sphinx, - pythonAtLeast, setuptools, }: @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "3.5.0"; pyproject = true; - disabled = pythonAtLeast "3.13"; - src = fetchPypi { inherit pname version; hash = "sha256-3h1dXtIMk1/CgbUP30ppUo+Q8qdb7PQtGIRD9eGWwJ8="; From d449c9cae1dd42d95431dd7a204b98da831c2668 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Jun 2025 15:02:52 +0200 Subject: [PATCH 2/6] python313Packages.python-cinderclient: disable very sensitive test which failed due to a dependency update --- pkgs/development/python-modules/python-cinderclient/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/python-cinderclient/default.nix b/pkgs/development/python-modules/python-cinderclient/default.nix index ca6110b77e87..57f7915e6316 100644 --- a/pkgs/development/python-modules/python-cinderclient/default.nix +++ b/pkgs/development/python-modules/python-cinderclient/default.nix @@ -76,6 +76,7 @@ buildPythonPackage rec { cinderclient.tests.unit.test_client.ClientTest.test_sessionclient_request_method_raises_badrequest cinderclient.tests.unit.test_client.ClientTest.test_sessionclient_request_method_raises_overlimit cinderclient.tests.unit.test_shell.ShellTest.test_password_prompted + cinderclient.tests.unit.test_shell.TestLoadVersionedActions.test_load_versioned_actions_with_help ") runHook postCheck From c4eb085322ba2935746d98b49e1c6556b5517d07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Jun 2025 15:19:45 +0200 Subject: [PATCH 3/6] treewide: bump openstack clis to python 3.13 --- pkgs/top-level/all-packages.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 254403a5c8f0..44842812ab7a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9207,21 +9207,21 @@ with pkgs; opencolorio = callPackage ../development/libraries/opencolorio { }; opencolorio_1 = callPackage ../development/libraries/opencolorio/1.x.nix { }; - openstackclient = with python312Packages; toPythonApplication python-openstackclient; + openstackclient = with python313Packages; toPythonApplication python-openstackclient; openstackclient-full = openstackclient.overridePythonAttrs (oldAttrs: { dependencies = oldAttrs.dependencies ++ oldAttrs.optional-dependencies.cli-plugins; }); - barbicanclient = with python312Packages; toPythonApplication python-barbicanclient; - glanceclient = with python312Packages; toPythonApplication python-glanceclient; - heatclient = with python312Packages; toPythonApplication python-heatclient; - ironicclient = with python312Packages; toPythonApplication python-ironicclient; - magnumclient = with python312Packages; toPythonApplication python-magnumclient; - manilaclient = with python312Packages; toPythonApplication python-manilaclient; - mistralclient = with python312Packages; toPythonApplication python-mistralclient; - swiftclient = with python312Packages; toPythonApplication python-swiftclient; - troveclient = with python312Packages; toPythonApplication python-troveclient; - watcherclient = with python312Packages; toPythonApplication python-watcherclient; - zunclient = with python312Packages; toPythonApplication python-zunclient; + barbicanclient = with python313Packages; toPythonApplication python-barbicanclient; + glanceclient = with python313Packages; toPythonApplication python-glanceclient; + heatclient = with python313Packages; toPythonApplication python-heatclient; + ironicclient = with python313Packages; toPythonApplication python-ironicclient; + magnumclient = with python313Packages; toPythonApplication python-magnumclient; + manilaclient = with python313Packages; toPythonApplication python-manilaclient; + mistralclient = with python313Packages; toPythonApplication python-mistralclient; + swiftclient = with python313Packages; toPythonApplication python-swiftclient; + troveclient = with python313Packages; toPythonApplication python-troveclient; + watcherclient = with python313Packages; toPythonApplication python-watcherclient; + zunclient = with python313Packages; toPythonApplication python-zunclient; openvdb = callPackage ../development/libraries/openvdb { }; From 5ad67720a03253093e0d1210e8340cf7bc5f6a59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Jun 2025 19:59:57 +0200 Subject: [PATCH 4/6] python313Packages.oslo-log: ignore some new test failures, remove one no longer relevant one --- pkgs/development/python-modules/oslo-log/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index 936af70c2e87..80af01d323e0 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -69,8 +69,9 @@ buildPythonPackage rec { disabledTests = [ # not compatible with sandbox "test_logging_handle_error" - # File which is used doesn't seem not to be present - "test_log_config_append_invalid" + # Incompatible Exception Representation, displaying natively + "test_rate_limit" + "test_rate_limit_except_level" ]; pythonImportsCheck = [ "oslo_log" ]; From 777f8cb818bc8d3f80b191cd32c7170208a39d93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Jun 2025 20:40:12 +0200 Subject: [PATCH 5/6] python313Packages.python-glanceclient: add more failed tests --- .../python-modules/python-glanceclient/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-glanceclient/default.nix b/pkgs/development/python-modules/python-glanceclient/default.nix index 209f587f8b9d..ae5626100717 100644 --- a/pkgs/development/python-modules/python-glanceclient/default.nix +++ b/pkgs/development/python-modules/python-glanceclient/default.nix @@ -24,8 +24,8 @@ let pname = "python-glanceclient"; version = "4.8.0"; - # Skip tests which require networking. disabledTests = [ + # Skip tests which require networking. "test_http_chunked_response" "test_v1_download_has_no_stray_output_to_stdout" "test_v2_requests_valid_cert_verification" @@ -40,6 +40,9 @@ let "test_v2_requests_valid_cert_no_key" "test_v2_requests_valid_cert_verification_no_compression" "test_log_request_id_once" + # asserts exact amount of mock calls + "test_cache_schemas_gets_when_forced" + "test_cache_schemas_gets_when_not_exists" ]; in buildPythonPackage { From d5deebda5a334245ec856544cbc88bae4355b58a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Jun 2025 20:52:20 +0200 Subject: [PATCH 6/6] kolla: ignore test which failed because of an additional close syscall --- pkgs/by-name/ko/kolla/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ko/kolla/package.nix b/pkgs/by-name/ko/kolla/package.nix index 975d44e5bce9..3c7698f87554 100644 --- a/pkgs/by-name/ko/kolla/package.nix +++ b/pkgs/by-name/ko/kolla/package.nix @@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec { # Tests output a few exceptions but still succeed checkPhase = '' runHook preCheck - stestr run + stestr run -e <(echo "test_load_ok") runHook postCheck '';