[oe-commits] [openembedded-core] branch master-next updated: python3-testtools: Avoid traceback2 module requirement

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

The following commit(s) were added to refs/heads/master-next by this push:
     new 8be4fe9  python3-testtools: Avoid traceback2 module requirement
8be4fe9 is described below

commit 8be4fe97e3d6e05e4e7c4b7b68e12010b3158cbc
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Thu Nov 28 12:08:55 2019 +0000

    python3-testtools: Avoid traceback2 module requirement
    
    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.
    
    [YOCTO #13652]
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 .../python/python3-testtools/no_traceback2.patch   | 23 ++++++++++++++++++++++
 .../python/python3-testtools_2.3.0.bb              |  2 ++
 2 files changed, 25 insertions(+)

diff --git a/meta/recipes-devtools/python/python3-testtools/no_traceback2.patch b/meta/recipes-devtools/python/python3-testtools/no_traceback2.patch
new file mode 100644
index 0000000..5945103
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-testtools/no_traceback2.patch
@@ -0,0 +1,23 @@
+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 <richard.purdie at linuxfoundation.org>
+
+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.3.0.bb b/meta/recipes-devtools/python/python3-testtools_2.3.0.bb
index 896ecee..a254b90 100644
--- a/meta/recipes-devtools/python/python3-testtools_2.3.0.bb
+++ b/meta/recipes-devtools/python/python3-testtools_2.3.0.bb
@@ -1,2 +1,4 @@
 inherit setuptools3
 require python-testtools.inc
+
+SRC_URI += "file://no_traceback2.patch"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.