Drop no_traceback2.patch as issue fixed upstream.
Signed-off-by: Alexander Kanavin <[email protected]>
---
.../python/python-testtools.inc | 3 +--
.../python3-testtools/no_traceback2.patch | 23 -------------------
...ls_2.4.0.bb => python3-testtools_2.5.0.bb} | 2 --
3 files changed, 1 insertion(+), 27 deletions(-)
delete mode 100644
meta/recipes-devtools/python/python3-testtools/no_traceback2.patch
rename meta/recipes-devtools/python/{python3-testtools_2.4.0.bb =>
python3-testtools_2.5.0.bb} (54%)
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 <[email protected]>
-
-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.5.0.bb
similarity index 54%
rename from meta/recipes-devtools/python/python3-testtools_2.4.0.bb
rename to meta/recipes-devtools/python/python3-testtools_2.5.0.bb
index a254b90a75..896ecee65c 100644
--- a/meta/recipes-devtools/python/python3-testtools_2.4.0.bb
+++ b/meta/recipes-devtools/python/python3-testtools_2.5.0.bb
@@ -1,4 +1,2 @@
inherit setuptools3
require python-testtools.inc
-
-SRC_URI += "file://no_traceback2.patch"
--
2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#154092):
https://lists.openembedded.org/g/openembedded-core/message/154092
Mute This Topic: https://lists.openembedded.org/mt/84390486/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
