From e2ab375760b26b09064ae8f4cf4a835e97a09dbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 21 Jun 2026 14:47:37 -0700 Subject: [PATCH] python3Packages.python-subunit: rename from subunit The project name (e.g. on PyPI) is python-subunit. --- .../python-modules/os-client-config/default.nix | 4 ++-- pkgs/development/python-modules/oslotest/default.nix | 4 ++-- .../python-modules/python-octaviaclient/tests.nix | 4 ++-- .../{subunit => python-subunit}/default.nix | 2 +- pkgs/development/python-modules/stestr/default.nix | 4 ++-- pkgs/development/python-modules/tempest/default.nix | 4 ++-- .../development/python-modules/testrepository/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 8 ++++---- 9 files changed, 18 insertions(+), 17 deletions(-) rename pkgs/development/python-modules/{subunit => python-subunit}/default.nix (97%) diff --git a/pkgs/development/python-modules/os-client-config/default.nix b/pkgs/development/python-modules/os-client-config/default.nix index 6b95f5bb3462..9e64f72bd64f 100644 --- a/pkgs/development/python-modules/os-client-config/default.nix +++ b/pkgs/development/python-modules/os-client-config/default.nix @@ -10,7 +10,7 @@ python-glanceclient, setuptools, stestr, - subunit, + python-subunit, testscenarios, testtools, }: @@ -40,7 +40,7 @@ buildPythonPackage rec { nativeCheckInputs = [ fixtures jsonschema - subunit + python-subunit oslotest stestr testscenarios diff --git a/pkgs/development/python-modules/oslotest/default.nix b/pkgs/development/python-modules/oslotest/default.nix index 66c6b5741d45..292ff2c8a383 100644 --- a/pkgs/development/python-modules/oslotest/default.nix +++ b/pkgs/development/python-modules/oslotest/default.nix @@ -5,7 +5,7 @@ fixtures, pbr, six, - subunit, + python-subunit, callPackage, }: @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ fixtures six - subunit + python-subunit ]; # check in passthru.tests.pytest to escape infinite recursion with other oslo components diff --git a/pkgs/development/python-modules/python-octaviaclient/tests.nix b/pkgs/development/python-modules/python-octaviaclient/tests.nix index 34a5d74de468..10499d53e417 100644 --- a/pkgs/development/python-modules/python-octaviaclient/tests.nix +++ b/pkgs/development/python-modules/python-octaviaclient/tests.nix @@ -7,7 +7,7 @@ doc8, docutils, pygments, - subunit, + python-subunit, oslotest, stestr, testscenarios, @@ -29,7 +29,7 @@ buildPythonPackage { doc8 docutils pygments - subunit + python-subunit oslotest stestr testscenarios diff --git a/pkgs/development/python-modules/subunit/default.nix b/pkgs/development/python-modules/python-subunit/default.nix similarity index 97% rename from pkgs/development/python-modules/subunit/default.nix rename to pkgs/development/python-modules/python-subunit/default.nix index 810b053d2b00..feb1644030f3 100644 --- a/pkgs/development/python-modules/subunit/default.nix +++ b/pkgs/development/python-modules/python-subunit/default.nix @@ -18,8 +18,8 @@ }: buildPythonPackage { + pname = "python-subunit"; inherit (subunit) - pname version src meta diff --git a/pkgs/development/python-modules/stestr/default.nix b/pkgs/development/python-modules/stestr/default.nix index 7af5331c3a99..14f79e2ada20 100644 --- a/pkgs/development/python-modules/stestr/default.nix +++ b/pkgs/development/python-modules/stestr/default.nix @@ -5,7 +5,7 @@ cliff, fixtures, flit-core, - subunit, + python-subunit, testtools, tomlkit, voluptuous, @@ -29,7 +29,7 @@ buildPythonPackage rec { dependencies = [ cliff fixtures - subunit + python-subunit testtools tomlkit voluptuous diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix index c3e40bd9f4e8..918cabbb3a12 100644 --- a/pkgs/development/python-modules/tempest/default.nix +++ b/pkgs/development/python-modules/tempest/default.nix @@ -24,7 +24,7 @@ setuptools, stestr, stevedore, - subunit, + python-subunit, testscenarios, testtools, urllib3, @@ -67,7 +67,7 @@ buildPythonPackage rec { pyyaml stestr stevedore - subunit + python-subunit testscenarios testtools urllib3 diff --git a/pkgs/development/python-modules/testrepository/default.nix b/pkgs/development/python-modules/testrepository/default.nix index edaaeed18d9d..19af11c17108 100644 --- a/pkgs/development/python-modules/testrepository/default.nix +++ b/pkgs/development/python-modules/testrepository/default.nix @@ -5,7 +5,7 @@ testtools, testresources, pbr, - subunit, + python-subunit, fixtures, python, }: @@ -24,7 +24,7 @@ buildPythonPackage rec { buildInputs = [ pbr ]; propagatedBuildInputs = [ fixtures - subunit + python-subunit testtools ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index e99e55652476..885bb235204e 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -600,6 +600,7 @@ mapAliases { sqlalchemy_migrate = throw "'sqlalchemy_migrate' has been renamed to/replaced by 'sqlalchemy-migrate'"; # Converted to throw 2025-10-29 steamship = throw "'steamship' has been removed because it is broken and unmaintained upstream"; # Added 2026-05-06 subunit2sql = throw "subunit2sql has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04 + subunit = python-subunit; # added 2026-06-21 supafunc = throw "'supafunc' has been replaced by 'supabase-functions'"; # Added 2026-03-08 supervise_api = throw "'supervise_api' has been renamed to/replaced by 'supervise-api'"; # Converted to throw 2025-10-29 swh-perfecthash = throw "'swh-perfecthash' has been renamed to/replaced by 'swh-shard'"; # added 2025-11-13 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1d0ef73df8c5..2f9d8b4d0030 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16343,6 +16343,10 @@ self: super: with self; { python-string-utils = callPackage ../development/python-modules/python-string-utils { }; + python-subunit = callPackage ../development/python-modules/python-subunit { + inherit (pkgs) subunit cppunit check; + }; + python-swiftclient = callPackage ../development/python-modules/python-swiftclient { }; python-tado = callPackage ../development/python-modules/python-tado { }; @@ -19204,10 +19208,6 @@ self: super: with self; { subprocess4 = callPackage ../development/python-modules/subprocess4 { }; - subunit = callPackage ../development/python-modules/subunit { - inherit (pkgs) subunit cppunit check; - }; - subzerod = callPackage ../development/python-modules/subzerod { }; succulent = callPackage ../development/python-modules/succulent { };