python312Packages.python-octaviaclient: 3.8.0 -> 3.9.0; python312Packages.openstacksdk: 4.0.0 -> 4.2.0; python312Packages.python-neutronclient: 11.3.1 -> 11.4.0 (#374569)

pkgs/development/python-modules/openstacksdk/default.nix

@@ -10,10 +10,10 @@
   jsonpatch,
   keystoneauth1,
   munch,
-  netifaces,
   openstackdocstheme,
   os-service-types,
   pbr,
+  psutil,
   pythonOlder,
   pyyaml,
   requestsexceptions,
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "openstacksdk";
-  version = "4.0.0";
+  version = "4.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-54YN2WtwUxMJI8EdVx0lgCuWjx4xOIRct8rHxrMzv0s=";
+    hash = "sha256-XLlFDczoBUosr4nYvp5VBX3fohmpVOeBAyJB6ykoBEU=";
   };
 
   postPatch = ''
@@ -61,9 +61,9 @@ buildPythonPackage rec {
     jsonpatch
     keystoneauth1
     munch
-    netifaces
     os-service-types
     pbr
+    psutil
     requestsexceptions
     pyyaml
   ];

pkgs/development/python-modules/python-neutronclient/default.nix

@@ -35,20 +35,14 @@
 
 buildPythonPackage rec {
   pname = "python-neutronclient";
-  version = "11.3.1";
+  version = "11.4.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-U82ZI/Q6OwdypA41YfdGVa3IA4+QJhqz3gW2IR0S7cs=";
+    hash = "sha256-h0Ehk2Lkv5wuQ/LmyuTUmR7Y+d+QY/Q0CKC2WLA9YuI=";
   };
 
-  patches = [
-    # fix wheel metadata to support python 3.12
-    # based on https://github.com/openstack/python-neutronclient/commit/f882f1ddb60bcd77096eb8a74e9e86d10723e8be
-    ./python-3.12.diff
-  ];
-
   build-system = [
     setuptools
     pbr

pkgs/development/python-modules/python-neutronclient/python-3.12.diff

@@ -1,23 +0,0 @@
---- a/setup.cfg	2024-12-25 04:00:53.429397282 +0100
-+++ b/setup.cfg	2024-12-25 04:03:48.308447471 +0100
-@@ -6,7 +6,7 @@
- author = OpenStack Networking Project
- author_email = openstack-discuss@lists.openstack.org
- home_page = https://docs.openstack.org/python-neutronclient/latest/
--python_requires = >=3.8
-+python_requires = >=3.9
- classifier = 
- 	Environment :: OpenStack
- 	Intended Audience :: Developers
-@@ -18,8 +18,10 @@
- 	Programming Language :: Python :: Implementation :: CPython
- 	Programming Language :: Python :: 3 :: Only
- 	Programming Language :: Python :: 3
--	Programming Language :: Python :: 3.8
- 	Programming Language :: Python :: 3.9
-+	Programming Language :: Python :: 3.10
-+	Programming Language :: Python :: 3.11
-+	Programming Language :: Python :: 3.12
- 
- [files]
- packages = 

pkgs/development/python-modules/python-octaviaclient/default.nix

@@ -7,8 +7,10 @@
   fetchPypi,
   hacking,
   keystoneauth1,
+  makePythonPath,
   openstackclient,
   openstackdocstheme,
+  installer,
   osc-lib,
   oslotest,
   oslo-serialization,
@@ -28,14 +30,20 @@
 
 buildPythonPackage rec {
   pname = "python-octaviaclient";
-  version = "3.8.0";
+  version = "3.9.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-wrYhCY3gqcklSK8lapsgFq25Yi3awEGgarW2a7W1kO4=";
+    hash = "sha256-cXReOIfgC5Fx5gT0vF/pV7QwEuC2YfnW4OE+m7nqr20=";
   };
 
+  postPatch = ''
+    # somehow python-neutronclient cannot be found despite it being supplied
+    substituteInPlace requirements.txt \
+      --replace-fail "python-neutronclient>=6.7.0" ""
+  '';
+
   build-system = [
     setuptools
     pbr
@@ -58,6 +66,11 @@ buildPythonPackage rec {
     requests
   ];
 
+  preInstall = ''
+    # TODO: I have really no idea why installer is missing...
+    export PYTHONPATH=$PYTHONPATH:${makePythonPath [ installer ]}
+  '';
+
   nativeCheckInputs = [
     hacking
     requests-mock
@@ -73,6 +86,9 @@ buildPythonPackage rec {
   checkPhase = ''
     runHook preCheck
 
+    # TODO: no idea why PYTHONPATH is broken here
+    export PYTHONPATH=$PYTHONPATH:${makePythonPath nativeCheckInputs}
+
     stestr run
 
     runHook postCheck
@@ -82,7 +98,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "OpenStack Octavia Command-line Client";
-    homepage = "https://opendev.org/openstack/python-octaviaclient/";
+    homepage = "https://github.com/openstack/python-octaviaclient";
     license = licenses.asl20;
     maintainers = teams.openstack.members;
   };