From a592d741dec7151d3d32c4584568e49d69ed5b6f Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 23 Jul 2021 00:45:04 +0200 Subject: python3-testools: update 2.4.0 -> 2.5.0 Drop no_traceback2.patch as issue fixed upstream. Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python-testtools.inc | 3 +-- .../python/python3-testtools/no_traceback2.patch | 23 ---------------------- .../python/python3-testtools_2.4.0.bb | 4 ---- .../python/python3-testtools_2.5.0.bb | 2 ++ 4 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-testtools/no_traceback2.patch delete mode 100644 meta/recipes-devtools/python/python3-testtools_2.4.0.bb create mode 100644 meta/recipes-devtools/python/python3-testtools_2.5.0.bb diff --git a/meta/recipes-devtools/python/python-testtools.inc b/meta/recipes-devtools/python/python-testtools.inc index e8d308b717..de463fc2c3 100644 --- a/meta/recipes-devtools/python/python-testtools.inc +++ b/meta/recipes-devtools/python/python-testtools.inc @@ -6,8 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e2c9d3e8ba7141c83bfef190e0b9379a" inherit pypi -SRC_URI[md5sum] = "e8fc7185b47cfb908c641f8c4b2a6add" -SRC_URI[sha256sum] = "64c974a6cca4385d05f4bbfa2deca1c39ce88ede31c3448bee86a7259a9a61c8" +SRC_URI[sha256sum] = "57c13433d94f9ffde3be6534177d10fb0c1507cc499319128958ca91a65cb23f" DEPENDS += " \ ${PYTHON_PN}-pbr \ diff --git a/meta/recipes-devtools/python/python3-testtools/no_traceback2.patch b/meta/recipes-devtools/python/python3-testtools/no_traceback2.patch deleted file mode 100644 index 594510342b..0000000000 --- a/meta/recipes-devtools/python/python3-testtools/no_traceback2.patch +++ /dev/null @@ -1,23 +0,0 @@ -traceback2 adds traceback for python2. Rather than depend on traceback2, we're -python3 only so just use traceback. -This caused breakage in oe-selftest -j which uses testtools on the autobuilder -using buildtools-tarball. - -Upstream-Status: Inappropriate [Our recipe is python3 specific] -(Once py2 is EOL upstream probably could/should take this) -Signed-off-by: Richard Purdie - -Index: testtools-2.3.0/testtools/content.py -=================================================================== ---- testtools-2.3.0.orig/testtools/content.py -+++ testtools-2.3.0/testtools/content.py -@@ -19,8 +19,7 @@ import os - import sys - - from extras import try_import --# To let setup.py work, make this a conditional import. --traceback = try_import('traceback2') -+import traceback - - from testtools.compat import ( - _b, diff --git a/meta/recipes-devtools/python/python3-testtools_2.4.0.bb b/meta/recipes-devtools/python/python3-testtools_2.4.0.bb deleted file mode 100644 index a254b90a75..0000000000 --- a/meta/recipes-devtools/python/python3-testtools_2.4.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -inherit setuptools3 -require python-testtools.inc - -SRC_URI += "file://no_traceback2.patch" diff --git a/meta/recipes-devtools/python/python3-testtools_2.5.0.bb b/meta/recipes-devtools/python/python3-testtools_2.5.0.bb new file mode 100644 index 0000000000..896ecee65c --- /dev/null +++ b/meta/recipes-devtools/python/python3-testtools_2.5.0.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-testtools.inc -- cgit 1.2.3-korg