From e4ad5fa9aef6a7431c6a0f32f1b99208389c4966 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Aug 2025 01:20:01 +0000 Subject: [PATCH 1/6] python3Packages.oslo-concurrency: 7.1.0 -> 7.2.0 --- .../python-modules/oslo-concurrency/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-concurrency/default.nix b/pkgs/development/python-modules/oslo-concurrency/default.nix index e554b710e723..f64d6e7cdddf 100644 --- a/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -4,12 +4,14 @@ fetchPypi, bash, coreutils, + debtcollector, eventlet, fasteners, fixtures, iana-etc, libredirect, oslo-config, + oslo-i18n, oslo-utils, oslotest, pbr, @@ -19,13 +21,13 @@ buildPythonPackage rec { pname = "oslo-concurrency"; - version = "7.1.0"; + version = "7.2.0"; pyproject = true; src = fetchPypi { pname = "oslo_concurrency"; inherit version; - hash = "sha256-34qHf4ACsH1p8dDnDbzvSSDTkkmqpi5Hj60haz3UFMs="; + hash = "sha256-Fg6BTIVJ9qRk53oEJl7ZltWBvdP9O9Tr8xHTRGu34ao="; }; postPatch = '' @@ -43,8 +45,10 @@ buildPythonPackage rec { build-system = [ setuptools ]; dependencies = [ + debtcollector fasteners oslo-config + oslo-i18n oslo-utils pbr ]; From a2c6c6a027610f682e21b0744608c4db93b455f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 1 Sep 2025 23:23:14 +0200 Subject: [PATCH 2/6] python313Packages.oslo-concurrency: fetch from GitHub --- .../python-modules/oslo-concurrency/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/oslo-concurrency/default.nix b/pkgs/development/python-modules/oslo-concurrency/default.nix index f64d6e7cdddf..80cb37c8c2d4 100644 --- a/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, bash, coreutils, debtcollector, @@ -24,17 +24,14 @@ buildPythonPackage rec { version = "7.2.0"; pyproject = true; - src = fetchPypi { - pname = "oslo_concurrency"; - inherit version; - hash = "sha256-Fg6BTIVJ9qRk53oEJl7ZltWBvdP9O9Tr8xHTRGu34ao="; + src = fetchFromGitHub { + owner = "openstack"; + repo = "oslo.concurrency"; + tag = version; + hash = "sha256-72KatSWTCx4hyUel2Fu5yiqrdYveRGruvJDWWo1hkIk="; }; postPatch = '' - # only a small portion of the listed packages are actually needed for running the tests - # so instead of removing them one by one remove everything - rm test-requirements.txt - substituteInPlace oslo_concurrency/tests/unit/test_processutils.py \ --replace-fail "/bin/bash" "${bash}/bin/bash" \ --replace-fail "/usr/bin/true" "${coreutils}/bin/true" \ @@ -42,6 +39,8 @@ buildPythonPackage rec { --replace-fail "/usr/bin/env" "${coreutils}/bin/env" ''; + env.PBR_VERSION = version; + build-system = [ setuptools ]; dependencies = [ From 6e396391d350d0c43443f12ae14d45c7a394c7ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 1 Sep 2025 23:23:22 +0200 Subject: [PATCH 3/6] python313Packages.oslo-concurrency: enable tests again, disable hanging tests --- pkgs/development/python-modules/oslo-concurrency/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/oslo-concurrency/default.nix b/pkgs/development/python-modules/oslo-concurrency/default.nix index 80cb37c8c2d4..6d85d1349e5a 100644 --- a/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -52,9 +52,6 @@ buildPythonPackage rec { pbr ]; - # tests hang for unknown reason and time the build out - doCheck = false; - nativeCheckInputs = [ eventlet fixtures @@ -70,6 +67,8 @@ buildPythonPackage rec { stestr run -e <(echo " oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_fair_lock_with_spawn oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_fair_lock_with_spawn_n + oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_lock_with_spawn + oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_lock_with_spawn_n ") ''; From 76bd03fb33b3b551a46ea5541b494b0d5c6659d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 1 Sep 2025 23:58:28 +0200 Subject: [PATCH 4/6] python313Packages.oslo-concurrency: fix tests on darwin --- .../python-modules/oslo-concurrency/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/oslo-concurrency/default.nix b/pkgs/development/python-modules/oslo-concurrency/default.nix index 6d85d1349e5a..2ecfdda87e27 100644 --- a/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -16,6 +16,7 @@ oslotest, pbr, setuptools, + stdenv, stestr, }: @@ -33,10 +34,10 @@ buildPythonPackage rec { postPatch = '' substituteInPlace oslo_concurrency/tests/unit/test_processutils.py \ + --replace-fail "/usr" "" \ --replace-fail "/bin/bash" "${bash}/bin/bash" \ - --replace-fail "/usr/bin/true" "${coreutils}/bin/true" \ --replace-fail "/bin/true" "${coreutils}/bin/true" \ - --replace-fail "/usr/bin/env" "${coreutils}/bin/env" + --replace-fail "/bin/env" "${coreutils}/bin/env" ''; env.PBR_VERSION = version; @@ -69,7 +70,12 @@ buildPythonPackage rec { oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_fair_lock_with_spawn_n oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_lock_with_spawn oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_lock_with_spawn_n - ") + ${lib.optionalString stdenv.hostPlatform.isDarwin '' + oslo_concurrency.tests.unit.test_lockutils.FileBasedLockingTestCase.test_interprocess_nonblocking_external_lock + oslo_concurrency.tests.unit.test_lockutils.LockTestCase.test_lock_externally + oslo_concurrency.tests.unit.test_lockutils.LockTestCase.test_lock_externally_lock_dir_not_exist + oslo_concurrency.tests.unit.test_processutils.PrlimitTestCase.test_stack_size + ''}") ''; pythonImportsCheck = [ "oslo_concurrency" ]; From d24d6449a0cf42fb70fd64b173ab5aedb1254e72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 2 Sep 2025 01:17:32 +0200 Subject: [PATCH 5/6] python313Packages.osc-lib: fix tests on darwin --- pkgs/development/python-modules/osc-lib/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/osc-lib/default.nix b/pkgs/development/python-modules/osc-lib/default.nix index 7f66de96733c..4c58dffea4cf 100644 --- a/pkgs/development/python-modules/osc-lib/default.nix +++ b/pkgs/development/python-modules/osc-lib/default.nix @@ -11,6 +11,7 @@ requests, requests-mock, setuptools, + stdenv, stestr, stevedore, }: @@ -27,8 +28,7 @@ buildPythonPackage rec { hash = "sha256-P1f0wwtOo0LKbc3ay0Vh8GGi/2nRXcTr9JOByc2nlZY="; }; - # fake version to make pbr.packaging happy and not reject it... - PBR_VERSION = version; + env.PBR_VERSION = version; build-system = [ pbr @@ -51,7 +51,13 @@ buildPythonPackage rec { ]; checkPhase = '' - stestr run + stestr run -e <(echo " + ${lib.optionalString stdenv.hostPlatform.isDarwin '' + osc_lib.tests.test_shell.TestShellCli.test_shell_args_cloud_public + osc_lib.tests.test_shell.TestShellCli.test_shell_args_precedence + osc_lib.tests.test_shell.TestShellCliPrecedence.test_shell_args_precedence_1 + osc_lib.tests.test_shell.TestShellCliPrecedence.test_shell_args_precedence_2 + ''}") ''; pythonImportsCheck = [ "osc_lib" ]; From 73c35002215601f5dff919f848408f8148f50494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 2 Sep 2025 01:17:39 +0200 Subject: [PATCH 6/6] python313Packages.python-octaviaclient: do not mix python versions openstackclient is the wrapped package which exposes the cli. For the python package we want to use python-openstackclient. --- .../python-modules/python-octaviaclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-octaviaclient/default.nix b/pkgs/development/python-modules/python-octaviaclient/default.nix index 19a9ed79b428..950c3344c066 100644 --- a/pkgs/development/python-modules/python-octaviaclient/default.nix +++ b/pkgs/development/python-modules/python-octaviaclient/default.nix @@ -8,7 +8,6 @@ hacking, keystoneauth1, makePythonPath, - openstackclient, openstackdocstheme, installer, osc-lib, @@ -18,6 +17,7 @@ pbr, pygments, python-neutronclient, + python-openstackclient, requests, requests-mock, setuptools, @@ -57,7 +57,7 @@ buildPythonPackage rec { cliff keystoneauth1 python-neutronclient - openstackclient + python-openstackclient osc-lib oslo-serialization oslo-utils