Merge pull request #283170 from SuperSandro2000/oslo-db

pkgs/development/python-modules/oslo-db/default.nix

@@ -2,14 +2,17 @@
 , buildPythonPackage
 , fetchPypi
 , alembic
+, debtcollector
 , oslo-config
 , oslo-context
+, oslo-i18n
 , oslo-utils
 , oslotest
 , pbr
+, psycopg2
 , setuptools
 , sqlalchemy
-, sqlalchemy-migrate
+, stevedore
 , stestr
 , testresources
 , testscenarios
@@ -33,18 +36,21 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     alembic
+    debtcollector
     oslo-config
-    oslo-context
+    oslo-i18n
     oslo-utils
     sqlalchemy
-    sqlalchemy-migrate
-    testresources
-    testscenarios
+    stevedore
   ];
 
   nativeCheckInputs = [
+    oslo-context
     oslotest
     stestr
+    psycopg2
+    testresources
+    testscenarios
   ];
 
   checkPhase = ''

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

@@ -7,6 +7,8 @@
 , pbr
 , python-dateutil
 , stestr
+, testresources
+, testscenarios
 }:
 
 buildPythonPackage rec {
@@ -29,6 +31,8 @@ buildPythonPackage rec {
     mock
     oslo-concurrency
     stestr
+    testresources
+    testscenarios
   ];
 
   checkPhase = ''
@@ -52,5 +56,7 @@ buildPythonPackage rec {
     homepage = "https://opendev.org/opendev/subunit2sql";
     license = licenses.asl20;
     maintainers = teams.openstack.members;
+    # version 1.10.0 is incomptaible with oslo-db 14.0.0
+    broken = true;
   };
 }