10 files changed, 33 insertions, 46 deletions

diff --git a/meta-python/conf/include/ptest-packagelists-meta-python.inc b/meta-python/conf/include/ptest-packagelists-meta-python.inc
index b953ae2502..c62bfab034 100644
--- a/meta-python/conf/include/ptest-packagelists-meta-python.inc
+++ b/meta-python/conf/include/ptest-packagelists-meta-python.inc
@@ -72,6 +72,7 @@ PTESTS_FAST_META_PYTHON = "\
     python3-pyroute2 \
     python3-pyserial \
     python3-pytest-mock \
+    python3-pytest-sugar \
     python3-pytoml \
     python3-pyyaml-include \
     python3-pydbus \
diff --git a/meta-python/recipes-devtools/python/python3-awesomeversion_24.6.0.bb b/meta-python/recipes-devtools/python/python3-awesomeversion_25.5.0.bb
index 8bb5ddd54e..ae600a48b6 100644
--- a/meta-python/recipes-devtools/python/python3-awesomeversion_24.6.0.bb
+++ b/meta-python/recipes-devtools/python/python3-awesomeversion_25.5.0.bb
@@ -4,7 +4,7 @@ SECTION = "devel/python"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENCE.md;md5=92622b5a8e216099be741d78328bae5d"
 
-SRC_URI[sha256sum] = "aee7ccbaed6f8d84e0f0364080c7734a0166d77ea6ccfcc4900b38917f1efc71"
+SRC_URI[sha256sum] = "d64c9f3579d2f60a5aa506a9dd0b38a74ab5f45e04800f943a547c1102280f31"
 
 RDEPENDS:${PN} += "python3-profile python3-logging"
 
diff --git a/meta-python/recipes-devtools/python/python3-cmd2_2.5.11.bb b/meta-python/recipes-devtools/python/python3-cmd2_2.6.0.bb
index 45644b4e8f..b5dc97fb02 100644
--- a/meta-python/recipes-devtools/python/python3-cmd2_2.5.11.bb
+++ b/meta-python/recipes-devtools/python/python3-cmd2_2.6.0.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=01d2b71040983a2abc614fc4d0284771"
 
 DEPENDS += "python3-setuptools-scm-native"
 
-SRC_URI[sha256sum] = "30a0d385021fbe4a4116672845e5695bbe56eb682f9096066776394f954a7429"
+SRC_URI[sha256sum] = "8cffaba7810526421cab3bfa0101b4907e1298ff2bcd8119615965a2eae5d95f"
 
 inherit pypi python_setuptools_build_meta python3native
 
diff --git a/meta-python/recipes-devtools/python/python3-coverage_7.8.0.bb b/meta-python/recipes-devtools/python/python3-coverage_7.8.2.bb
index 9c4330a361..9438d2f32c 100644
--- a/meta-python/recipes-devtools/python/python3-coverage_7.8.0.bb
+++ b/meta-python/recipes-devtools/python/python3-coverage_7.8.2.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://coverage.readthedocs.io"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ee41112a44fe7014dce33e26468ba93"
 
-SRC_URI[sha256sum] = "7a3d62b3b03b4b6fd41a085f3574874cf946cb4604d2b4d3e8dca8cd570ca501"
+SRC_URI[sha256sum] = "a886d531373a1f6ff9fad2a2ba4a045b68467b779ae729ee0b3b10ac20033b27"
 
 inherit pypi python_setuptools_build_meta
 
diff --git a/meta-python/recipes-devtools/python/python3-freezegun/1777174bb97c0b514033a09b820078b0d117f4a8.patch b/meta-python/recipes-devtools/python/python3-freezegun/1777174bb97c0b514033a09b820078b0d117f4a8.patch
deleted file mode 100644
index 4604da2b57..0000000000
--- a/meta-python/recipes-devtools/python/python3-freezegun/1777174bb97c0b514033a09b820078b0d117f4a8.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 1777174bb97c0b514033a09b820078b0d117f4a8 Mon Sep 17 00:00:00 2001
-From: Bert Blommers <info@bertblommers.nl>
-Date: Fri, 28 Jun 2024 19:21:04 +0000
-Subject: [PATCH] Admin: Support Python 3.13
-
-Upstream-Status: Backport [https://github.com/spulec/freezegun/pull/550]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- .github/workflows/ci.yaml | 9 ++++++---
- tests/test_datetimes.py   | 6 +++---
- 2 files changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/tests/test_datetimes.py b/tests/test_datetimes.py
-index a6f1989..b75ad3b 100644
---- a/tests/test_datetimes.py
-+++ b/tests/test_datetimes.py
-@@ -534,17 +534,17 @@ def test_method_decorator_works_on_unittest(self) -> None:
-     @freeze_time('2013-04-09', as_kwarg='frozen_time')
-     def test_method_decorator_works_on_unittest_kwarg_frozen_time(self, frozen_time: Any) -> None:
-         self.assertEqual(datetime.date(2013, 4, 9), datetime.date.today())
--        self.assertEqual(datetime.date(2013, 4, 9), frozen_time.time_to_freeze.today())
-+        assert frozen_time.time_to_freeze.today().strftime('%Y-%m-%d') == "2013-04-09"
- 
-     @freeze_time('2013-04-09', as_kwarg='hello')
-     def test_method_decorator_works_on_unittest_kwarg_hello(self, **kwargs: Any) -> None:
-         self.assertEqual(datetime.date(2013, 4, 9), datetime.date.today())
--        self.assertEqual(datetime.date(2013, 4, 9), kwargs.get('hello').time_to_freeze.today())  # type: ignore
-+        assert kwargs.get("hello").time_to_freeze.today().strftime('%Y-%m-%d') == "2013-04-09"  # type: ignore
- 
-     @freeze_time(lambda: datetime.date(year=2013, month=4, day=9), as_kwarg='frozen_time')
-     def test_method_decorator_works_on_unittest_kwarg_frozen_time_with_func(self, frozen_time: Any) -> None:
-         self.assertEqual(datetime.date(2013, 4, 9), datetime.date.today())
--        self.assertEqual(datetime.date(2013, 4, 9), frozen_time.time_to_freeze.today())
-+        assert frozen_time.time_to_freeze.today().strftime('%Y-%m-%d') == "2013-04-09"
- 
- 
- @freeze_time('2013-04-09')
diff --git a/meta-python/recipes-devtools/python/python3-freezegun_1.5.1.bb b/meta-python/recipes-devtools/python/python3-freezegun_1.5.2.bb
index 9d823da507..56674c448b 100644
--- a/meta-python/recipes-devtools/python/python3-freezegun_1.5.1.bb
+++ b/meta-python/recipes-devtools/python/python3-freezegun_1.5.2.bb
@@ -3,14 +3,10 @@ HOMEPAGE = "https://github.com/spulec/freezegun"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=acf1d209bb6eddae4cbe6ffd6a0144fe"
 
-SRC_URI[sha256sum] = "b29dedfcda6d5e8e083ce71b2b542753ad48cfec44037b3fc79702e2980a89e9"
+SRC_URI[sha256sum] = "a54ae1d2f9c02dbf42e02c18a3ab95ab4295818b549a34dac55592d72a905181"
 
 inherit pypi python_setuptools_build_meta ptest-python-pytest
 
-SRC_URI += " \
-        file://1777174bb97c0b514033a09b820078b0d117f4a8.patch \
-"
-
 RDEPENDS:${PN}-ptest += " \
         python3-sqlite3 \
 "
diff --git a/meta-python/recipes-devtools/python/python3-pytest-sugar/run-ptest b/meta-python/recipes-devtools/python/python3-pytest-sugar/run-ptest
new file mode 100644
index 0000000000..b4bf4b65d8
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pytest-sugar/run-ptest
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+pytest -vv | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}'
diff --git a/meta-python/recipes-devtools/python/python3-pytest-sugar_1.0.0.bb b/meta-python/recipes-devtools/python/python3-pytest-sugar_1.0.0.bb
new file mode 100644
index 0000000000..9ce29aef7e
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pytest-sugar_1.0.0.bb
@@ -0,0 +1,23 @@
+SUMMARY = "pytest-sugar is a plugin for pytest that changes the default look and feel of pytest (e.g. progressbar, show tests that fail instantly)."
+HOMEPAGE = "https://github.com/Teemu/pytest-sugar"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=dfc31f3b2a6a301239a1ba99b71a9459"
+
+SRC_URI += "file://run-ptest"
+SRC_URI[sha256sum] = "6422e83258f5b0c04ce7c632176c7732cab5fdb909cb39cca5c9139f81276c0a"
+
+inherit pypi python_poetry_core ptest-python-pytest
+
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[dev] = ",,,python3-black python3-flake8 python3-pre-commit"
+
+do_install_ptest:append() {
+        install -d ${D}${PTEST_PATH}/tests
+        cp -rf ${S}/test_sugar.py ${D}${PTEST_PATH}/tests/
+}
+
+RDEPENDS:${PN} += "python3-packaging python3-pytest python3-termcolor \
+                   python3-core python3-packaging python3-pytest \
+                                   python3-pytest-xdist"
+
+RDEPENDS:${PN}-ptest +=  "python3-tox"
diff --git a/meta-python/recipes-devtools/python/python3-typer_0.16.0.bb b/meta-python/recipes-devtools/python/python3-typer_0.16.0.bb
index 87e258ae1f..5295d2213e 100644
--- a/meta-python/recipes-devtools/python/python3-typer_0.16.0.bb
+++ b/meta-python/recipes-devtools/python/python3-typer_0.16.0.bb
@@ -32,6 +32,7 @@ RDEPENDS:${PN}-ptest += "\
     python3-mypy \
     python3-pytest \
     python3-pytest-cov \
+    python3-pytest-sugar \
     python3-pytest-xdist \
     python3-rich \
     python3-shellingham \
diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet_3.12.1.bb b/meta-python/recipes-extended/python-blivet/python3-blivet_3.12.1.bb
index 6a00e48ebb..bf492b3d57 100644
--- a/meta-python/recipes-extended/python-blivet/python3-blivet_3.12.1.bb
+++ b/meta-python/recipes-extended/python-blivet/python3-blivet_3.12.1.bb
@@ -24,7 +24,7 @@ REQUIRED_DISTRO_FEATURES = "systemd"
 
 RDEPENDS:${PN} += "python3-pykickstart python3-pyudev \
                    parted python3-pyparted multipath-tools \
-                   lsof cryptsetup libblockdev \
+                   lsof cryptsetup libblockdev libblockdev-bin \
                    libbytesize \
 "