From 626c98f3fab98ddffd2c8d18c7ef93ff5c5605d0 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Tue, 3 Feb 2026 11:43:39 -0800 Subject: [PATCH 1/5] python3Packages.autopage: disable failing test on Darwin --- pkgs/development/python-modules/autopage/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/autopage/default.nix b/pkgs/development/python-modules/autopage/default.nix index 58f1a6d13250..c2ded3eb134c 100644 --- a/pkgs/development/python-modules/autopage/default.nix +++ b/pkgs/development/python-modules/autopage/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, setuptools, @@ -29,6 +30,11 @@ buildPythonPackage (finalAttrs: { ] ++ fixtures.optional-dependencies.streams; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + # https://github.com/zaneb/autopage/issues/7 + "test_end_to_end" + ]; + pythonImportsCheck = [ "autopage" ]; meta = { From 3d959a7868b0ccf6176985e28cdaef9be62f7ba5 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Tue, 3 Feb 2026 10:34:23 -0800 Subject: [PATCH 2/5] python3Packages.python-openstackclient: build from GitHub --- .../python-openstackclient/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 4641d32ffa59..cc7b6d2e6248 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, ddt, openstackdocstheme, osc-lib, @@ -37,12 +37,14 @@ buildPythonPackage rec { version = "8.3.0"; pyproject = true; - src = fetchPypi { - pname = "python_openstackclient"; - inherit version; - hash = "sha256-zHsy5F8Lju2SFeAhiuoCUmYZpeewaCsngXaRNK/Xb/g="; + src = fetchFromGitHub { + owner = "openstack"; + repo = "python-openstackclient"; + tag = version; + hash = "sha256-CEz1v4e4NadSZ+qhotFtLB4y/KdhDZbDOohN8D9FB30="; }; + env.PBR_VERSION = version; build-system = [ openstackdocstheme setuptools @@ -107,7 +109,8 @@ buildPythonPackage rec { meta = { description = "OpenStack Command-line Client"; mainProgram = "openstack"; - homepage = "https://github.com/openstack/python-openstackclient"; + homepage = "https://opendev.org/openstack/python-openstackclient"; + downloadPage = "https://github.com/openstack/python-openstackclient"; license = lib.licenses.asl20; teams = [ lib.teams.openstack ]; }; From d881affda0e39cf137629218f7464943b61d3c68 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Tue, 3 Feb 2026 10:34:23 -0800 Subject: [PATCH 3/5] python3Packages.python-openstackclient: disable failing tests under Python 3.14 --- .../python-modules/python-openstackclient/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index cc7b6d2e6248..d98225664320 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { }; env.PBR_VERSION = version; + build-system = [ openstackdocstheme setuptools @@ -70,10 +71,11 @@ buildPythonPackage rec { stestr ]; + # test_module failures under python 3.14: https://bugs.launchpad.net/python-openstackclient/+bug/2137223 checkPhase = '' runHook preCheck stestr run -E \ - "openstackclient.tests.unit.volume.v3.test_volume.(TestVolumeCreate|TestVolumeShow)" + "openstackclient.tests.unit.(volume.v3.test_volume.(TestVolumeCreate|TestVolumeShow)|common.test_module.TestModuleList)" runHook postCheck ''; From ec0f456ce4de88a62f6957559f90ef8c63a570d2 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Tue, 3 Feb 2026 10:34:23 -0800 Subject: [PATCH 4/5] python3Packages.python-openstackclient: migrate to finalAttrs --- .../python-modules/python-openstackclient/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index d98225664320..330c904fb1fb 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -32,7 +32,7 @@ testers, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-openstackclient"; version = "8.3.0"; pyproject = true; @@ -40,11 +40,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "openstack"; repo = "python-openstackclient"; - tag = version; + tag = finalAttrs.version; hash = "sha256-CEz1v4e4NadSZ+qhotFtLB4y/KdhDZbDOohN8D9FB30="; }; - env.PBR_VERSION = version; + env.PBR_VERSION = finalAttrs.version; build-system = [ openstackdocstheme @@ -112,8 +112,8 @@ buildPythonPackage rec { description = "OpenStack Command-line Client"; mainProgram = "openstack"; homepage = "https://opendev.org/openstack/python-openstackclient"; - downloadPage = "https://github.com/openstack/python-openstackclient"; + downloadPage = "https://github.com/openstack/python-openstackclient/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; teams = [ lib.teams.openstack ]; }; -} +}) From d028e96c6679671799d38311c2272dbc36ca44b4 Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 5 Feb 2026 16:20:29 +0100 Subject: [PATCH 5/5] python3Packages.python-openstackclient: change homepage to docs Co-authored-by: Valentin --- .../python-modules/python-openstackclient/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 330c904fb1fb..94a5d129c0c7 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -111,7 +111,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "OpenStack Command-line Client"; mainProgram = "openstack"; - homepage = "https://opendev.org/openstack/python-openstackclient"; + homepage = "https://docs.openstack.org/python-openstackclient/latest/"; downloadPage = "https://github.com/openstack/python-openstackclient/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; teams = [ lib.teams.openstack ];