From f28339f7d42b6171564732e1f3ccd86a824141a9 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Wed, 30 Apr 2025 23:45:45 +0200 Subject: [PATCH 01/14] python312Packages.python-magnumclient: 4.7.0 -> 4.8.1 Diff: https://github.com/openstack/python-magnumclient/compare/refs/tags/4.7.0...refs/tags/4.8.1 --- .../python-modules/python-magnumclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-magnumclient/default.nix b/pkgs/development/python-modules/python-magnumclient/default.nix index b38948d6c839..a20e7f524343 100644 --- a/pkgs/development/python-modules/python-magnumclient/default.nix +++ b/pkgs/development/python-modules/python-magnumclient/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "python-magnumclient"; - version = "4.7.0"; + version = "4.8.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "openstack"; repo = "python-magnumclient"; tag = version; - hash = "sha256-2JHI3CB/DSZZ4LXzL3PCUSmubTciUXtZkc5jpeEc4kk="; + hash = "sha256-rXLJnvGc5VHkHghCoBLRhARwl3hhS/oI2VOsGWfESkM="; }; env.PBR_VERSION = version; From f70b1fce32e807d877dc6bc874d76de089308062 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Wed, 30 Apr 2025 23:46:33 +0200 Subject: [PATCH 02/14] kolla: 18.1.0 -> 19.4.0 Diff: https://github.com/openstack/kolla/compare/18.1.0...19.4.0 --- pkgs/by-name/ko/kolla/package.nix | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/ko/kolla/package.nix b/pkgs/by-name/ko/kolla/package.nix index d3a635baef4c..975d44e5bce9 100644 --- a/pkgs/by-name/ko/kolla/package.nix +++ b/pkgs/by-name/ko/kolla/package.nix @@ -1,23 +1,19 @@ { lib, - python311Packages, + python3Packages, fetchFromGitHub, bashate, }: -let - pythonPackages = python311Packages; -in -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "kolla"; - version = "18.1.0"; - + version = "19.4.0"; pyproject = true; src = fetchFromGitHub { owner = "openstack"; repo = "kolla"; - hash = "sha256-jLD6ILihymQlWkkpGYC4OX8BKLpQurAK6Y5Xpju+QAI="; + hash = "sha256-yVNMCqg6eAUhLg3iAjDkYpMoIKc6OksDri9jNpyaS7c="; rev = version; }; @@ -26,21 +22,22 @@ pythonPackages.buildPythonApplication rec { --replace-fail "os.path.join(sys.prefix, 'share/kolla')," \ "os.path.join(PROJECT_ROOT, '../../../share/kolla')," - substituteInPlace test-requirements.txt \ - --replace-fail "hacking>=3.0.1,<3.1.0" "hacking" - sed -e 's/git_info = .*/git_info = "${version}"/' -i kolla/version.py ''; + pythonRelaxDeps = [ + "hacking" + ]; + # fake version to make pbr.packaging happy env.PBR_VERSION = version; - build-system = with pythonPackages; [ + build-system = with python3Packages; [ setuptools pbr ]; - dependencies = with pythonPackages; [ + dependencies = with python3Packages; [ docker jinja2 oslo-config @@ -49,10 +46,10 @@ pythonPackages.buildPythonApplication rec { ]; postInstall = '' - cp kolla/template/repos.yaml $out/${pythonPackages.python.sitePackages}/kolla/template/ + cp kolla/template/repos.yaml $out/${python3Packages.python.sitePackages}/kolla/template/ ''; - nativeCheckInputs = with pythonPackages; [ + nativeCheckInputs = with python3Packages; [ testtools stestr oslotest From 0f3cb90931e8f518add3997558ab3ecc401c095d Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Wed, 30 Apr 2025 23:49:03 +0200 Subject: [PATCH 03/14] python312Packages.osc-placement: 4.5.0 -> 4.6.0 Diff: https://github.com/openstack/osc-placement/compare/refs/tags/4.5.0...refs/tags/4.6.0 --- pkgs/development/python-modules/osc-placement/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/osc-placement/default.nix b/pkgs/development/python-modules/osc-placement/default.nix index 2a6e26775918..61de387850b9 100644 --- a/pkgs/development/python-modules/osc-placement/default.nix +++ b/pkgs/development/python-modules/osc-placement/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "osc-placement"; - version = "4.5.0"; + version = "4.6.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "openstack"; repo = "osc-placement"; tag = version; - hash = "sha256-PUwyYOg1dymlnnTr6TnxS42ISmbS00YfOdkL+5MbYFI="; + hash = "sha256-8D/8WRUZnVTCXL/I+KmIGKtnfyjM7evux808+XY3ciw="; }; env.PBR_VERSION = version; From 14f9072b1d14bd8533fccd073269c6a17908746b Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Wed, 30 Apr 2025 23:49:38 +0200 Subject: [PATCH 04/14] python312Packages.oslo-context: 5.7.0 -> 5.7.1 --- pkgs/development/python-modules/oslo-context/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/oslo-context/default.nix b/pkgs/development/python-modules/oslo-context/default.nix index f81be99451f3..b0f254c09b63 100644 --- a/pkgs/development/python-modules/oslo-context/default.nix +++ b/pkgs/development/python-modules/oslo-context/default.nix @@ -10,13 +10,14 @@ }: buildPythonPackage rec { - pname = "oslo.context"; - version = "5.7.0"; + pname = "oslo-context"; + version = "5.7.1"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-OYxGC5z3yzl+3nliIj5LiAePsvvFNmWkejThsoiQ9M4="; + inherit version; + pname = "oslo_context"; + hash = "sha256-DFEf4VNzKv8MGztEq9L1EAioPHB7uSm+4B4SVayWSIk="; }; postPatch = '' From e4d297876dc47f92731e3319a842cdca816513ad Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Wed, 30 Apr 2025 23:50:14 +0200 Subject: [PATCH 05/14] python312Packages.oslo-log: 6.2.0 -> 7.1.0 Diff: https://github.com/openstack/oslo.log/compare/refs/tags/6.2.0...refs/tags/7.1.0 --- pkgs/development/python-modules/oslo-log/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index f488d317c00c..7e34fb1f7cc3 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -8,6 +8,7 @@ setuptools, # dependencies + debtcollector, oslo-config, oslo-context, oslo-serialization, @@ -24,14 +25,14 @@ buildPythonPackage rec { pname = "oslo-log"; - version = "6.2.0"; + version = "7.1.0"; pyproject = true; src = fetchFromGitHub { owner = "openstack"; repo = "oslo.log"; tag = version; - hash = "sha256-IEhIhGE95zZiWp602rFc+NLco/Oyx9XEL5e2RExNBMs="; + hash = "sha256-ybWrNwP9L7iOzft10TgRFxA4mCRDVozVC2ZAopgITqo="; }; # Manually set version because prb wants to get it from the git upstream repository (and we are @@ -41,6 +42,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; dependencies = [ + debtcollector oslo-config oslo-context oslo-serialization From ff1179e8388d0d33f6e48029dfd2db33479d524b Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Wed, 30 Apr 2025 23:50:44 +0200 Subject: [PATCH 06/14] python312Packages.python-aodhclient: 3.6.0 -> 3.7.1 Diff: https://github.com/openstack/python-aodhclient/compare/refs/tags/3.6.0...refs/tags/3.7.1 --- .../python-modules/python-aodhclient/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-aodhclient/default.nix b/pkgs/development/python-modules/python-aodhclient/default.nix index b9ef6d55ace6..2038d9a404dc 100644 --- a/pkgs/development/python-modules/python-aodhclient/default.nix +++ b/pkgs/development/python-modules/python-aodhclient/default.nix @@ -21,16 +21,16 @@ buildPythonPackage rec { pname = "python-aodhclient"; - version = "3.6.0"; + version = "3.7.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "openstack"; repo = "python-aodhclient"; tag = version; - hash = "sha256-FArXBkDOY0Weu3Fm/M0Qgg0XHTy95MqlUidZ/hUZfB8="; + hash = "sha256-99oErtl1clqsMx/ZOTJZ4sNOUqiE2t/NtDQDrZaIV3Y="; }; env.PBR_VERSION = version; From 7ff72c8d6cef9a2c68f74dcd368a06f180563ddb Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 1 May 2025 00:23:49 +0200 Subject: [PATCH 07/14] python312Packages.python-barbicanclient: 7.0.0 -> 7.1.0 Diff: https://github.com/openstack/python-barbicanclient/compare/7.0.0...7.1.0 --- .../python-modules/python-barbicanclient/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-barbicanclient/default.nix b/pkgs/development/python-modules/python-barbicanclient/default.nix index 2b91fd28efc0..43a43e908de2 100644 --- a/pkgs/development/python-modules/python-barbicanclient/default.nix +++ b/pkgs/development/python-modules/python-barbicanclient/default.nix @@ -20,17 +20,17 @@ buildPythonPackage rec { pname = "python-barbicanclient"; - version = "7.0.0"; + version = "7.1.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitea { domain = "opendev.org"; owner = "openstack"; repo = "python-barbicanclient"; rev = version; - hash = "sha256-odoYyBulOQkjUpymFyZgvI+DYmdHJY3PaG8hh2ms+/0="; + hash = "sha256-VEK3MDuvciF4hpyNKTKWX2v3pSCcVi+YGgSKCLaWAuI="; }; env.PBR_VERSION = version; From 9818d246d1a36941b25e8553edde8ff43257eaf2 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Wed, 30 Apr 2025 23:51:03 +0200 Subject: [PATCH 08/14] python312Packages.python-designateclient: 6.1.0 -> 6.2.0 Diff: https://github.com/openstack/python-designateclient/compare/6.1.0...6.2.0 --- .../python-modules/python-designateclient/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-designateclient/default.nix b/pkgs/development/python-modules/python-designateclient/default.nix index dd638353d372..632b79265d5c 100644 --- a/pkgs/development/python-modules/python-designateclient/default.nix +++ b/pkgs/development/python-modules/python-designateclient/default.nix @@ -22,17 +22,17 @@ buildPythonPackage rec { pname = "python-designateclient"; - version = "6.1.0"; + version = "6.2.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitea { domain = "opendev.org"; owner = "openstack"; repo = "python-designateclient"; rev = version; - hash = "sha256-MwcpRQXH8EjWv41iHxorbFL9EpYu8qOLkDeUx6inEAU="; + hash = "sha256-Upfu6FDaCRXniJLacuIt6K0qi8aOvHU0t43F3uWvhG8="; }; env.PBR_VERSION = version; From b487e125092675bc1e229b014ba0232cc455ad57 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 1 May 2025 00:00:44 +0200 Subject: [PATCH 09/14] python312Packages.python-mistralclient: 5.3.0 -> 5.4.0 https://github.com/openstack/python-mistralclient/compare/5.3.0...5.4.0 --- .../python-modules/python-mistralclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-mistralclient/default.nix b/pkgs/development/python-modules/python-mistralclient/default.nix index dc763e1c54bc..e4af29877349 100644 --- a/pkgs/development/python-modules/python-mistralclient/default.nix +++ b/pkgs/development/python-modules/python-mistralclient/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "python-mistralclient"; - version = "5.3.0"; + version = "5.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "openstack"; repo = "python-mistralclient"; rev = version; - hash = "sha256-Vi56+OlFU2Aj7yJ/cH5y0ZbzPhglTciJcTnkbA0S7Qo="; + hash = "sha256-c1kMDyRNMZKnDvL993WvZSsjkXgYLM2+9KBmF+I4vnM="; }; env.PBR_VERSION = version; From 9bd58526cb2de2be6bbf6d0e9f74a951ed962834 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Wed, 30 Apr 2025 23:51:59 +0200 Subject: [PATCH 10/14] python312Packages.python-troveclient: 8.6.0 -> 8.8.0 Diff: https://github.com/openstack/python-troveclient/compare/refs/tags/8.6.0...refs/tags/8.8.0 --- .../python-modules/python-troveclient/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-troveclient/default.nix b/pkgs/development/python-modules/python-troveclient/default.nix index a97b5a8081dc..1b87fe41f48b 100644 --- a/pkgs/development/python-modules/python-troveclient/default.nix +++ b/pkgs/development/python-modules/python-troveclient/default.nix @@ -25,16 +25,16 @@ buildPythonPackage rec { pname = "python-troveclient"; - version = "8.6.0"; + version = "8.8.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "openstack"; repo = "python-troveclient"; tag = version; - hash = "sha256-6JviPG2ikKRqvW/eqPIHMvpV6GjqbaXYHhcOOpaIS4U="; + hash = "sha256-WBMXSZhkrKlEkVpy56zdBRzspUjUsj0dQ4OR250Fo+s="; }; env.PBR_VERSION = version; From 28ac8afa0bc6324ae35185fb1c54a450116481db Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Wed, 30 Apr 2025 23:52:04 +0200 Subject: [PATCH 11/14] python312Packages.python-watcherclient: 4.5.0 -> 4.8.0 Diff: https://github.com/openstack/python-watcherclient/compare/refs/tags/4.5.0...refs/tags/4.8.0 --- .../python-modules/python-watcherclient/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-watcherclient/default.nix b/pkgs/development/python-modules/python-watcherclient/default.nix index 6558a7d669f5..d70eb062280c 100644 --- a/pkgs/development/python-modules/python-watcherclient/default.nix +++ b/pkgs/development/python-modules/python-watcherclient/default.nix @@ -19,16 +19,16 @@ buildPythonPackage rec { pname = "python-watcherclient"; - version = "4.5.0"; + version = "4.8.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "openstack"; repo = "python-watcherclient"; tag = version; - hash = "sha256-lDdiZKaeteKZEyfjpBx8KY+0FLFOYAnQXl0pTbqq0Ss="; + hash = "sha256-ZwMsLXqfRw/qJ71B/WcLkK9TGX77GLiy/nLE7kRD1Xg="; }; env.PBR_VERSION = version; From 3e689086bca09c2d346eb8b5facd5f35c2aebcf8 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Wed, 30 Apr 2025 23:52:10 +0200 Subject: [PATCH 12/14] python312Packages.python-zaqarclient: 2.8.0 -> 3.0.0 Diff: https://github.com/openstack/python-zaqarclient/compare/refs/tags/2.8.0...refs/tags/3.0.0 --- .../python-modules/python-zaqarclient/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-zaqarclient/default.nix b/pkgs/development/python-modules/python-zaqarclient/default.nix index aaf4e3e5daa0..15910c737646 100644 --- a/pkgs/development/python-modules/python-zaqarclient/default.nix +++ b/pkgs/development/python-modules/python-zaqarclient/default.nix @@ -22,16 +22,16 @@ buildPythonPackage rec { pname = "python-zaqarclient"; - version = "2.8.0"; + version = "3.0.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "openstack"; repo = "python-zaqarclient"; tag = version; - hash = "sha256-vfu1GYd9eoVpmBtlnRTiqpiqlgxqPnwpFC9YC1UuvLM="; + hash = "sha256-SYHFzl7av/D4/2Ovnv95Ed4vaTxv/ke6FKVg+MWlGBI="; }; env.PBR_VERSION = version; From 1100a36eb0588f532624abe4a9c92ec7aed7d211 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Wed, 30 Apr 2025 23:52:14 +0200 Subject: [PATCH 13/14] python312Packages.python-zunclient: 5.1.0 -> 5.2.1 Diff: https://github.com/openstack/python-zunclient/compare/refs/tags/5.1.0...refs/tags/5.2.1 --- pkgs/development/python-modules/python-zunclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-zunclient/default.nix b/pkgs/development/python-modules/python-zunclient/default.nix index df9fc135c6c8..b7164d3a1c62 100644 --- a/pkgs/development/python-modules/python-zunclient/default.nix +++ b/pkgs/development/python-modules/python-zunclient/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-zunclient"; - version = "5.1.0"; + version = "5.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "openstack"; repo = "python-zunclient"; tag = version; - hash = "sha256-2gC2aMaMI//QKIpbDNT9cii17680g4X1c0rgrgPbAsg="; + hash = "sha256-YdE5a/qm91Nv2TW9pot9sn5GwvnFuqPCgiuLF6O7reA="; }; env.PBR_VERSION = version; From bd798bc09b430b6aac619c3f1592a31915dc6299 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 1 May 2025 00:35:15 +0200 Subject: [PATCH 14/14] python312Packages.stestr: 4.1.0 -> 4.2.0 Diff: https://github.com/mtreinish/stestr/compare/4.1.0...4.2.0 --- .../python-modules/stestr/default.nix | 23 +++++-------------- .../python-modules/stestr/tests.nix | 6 ----- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/stestr/default.nix b/pkgs/development/python-modules/stestr/default.nix index e7914a8f92b8..2697373f7e9c 100644 --- a/pkgs/development/python-modules/stestr/default.nix +++ b/pkgs/development/python-modules/stestr/default.nix @@ -4,9 +4,7 @@ fetchPypi, cliff, fixtures, - future, - pbr, - setuptools, + flit-core, subunit, testtools, tomlkit, @@ -16,30 +14,21 @@ buildPythonPackage rec { pname = "stestr"; - version = "4.1.0"; + version = "4.2.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-X2HDae7OY8KS0TWZ4SqhWK92hZkGQ/JN1vp/q/406Yo="; + hash = "sha256-Rexjny0cw3LjYwYTuT83zynT3+adSdTz+UCNN7Ebwpw="; }; - 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 - ''; - - nativeBuildInputs = [ - pbr - setuptools + build-system = [ + flit-core ]; - propagatedBuildInputs = [ + dependencies = [ cliff fixtures - future - pbr subunit testtools tomlkit diff --git a/pkgs/development/python-modules/stestr/tests.nix b/pkgs/development/python-modules/stestr/tests.nix index 21d1fd2c7a1e..d83533d8a34e 100644 --- a/pkgs/development/python-modules/stestr/tests.nix +++ b/pkgs/development/python-modules/stestr/tests.nix @@ -5,12 +5,6 @@ buildPythonPackage { inherit (stestr) version src; format = "other"; - 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 - ''; - dontBuild = true; dontInstall = true; preConfigure = ''