diff options
| author |   Trevor Gamblin <trevor.gamblin@windriver.com> | 2020-01-02 12:03:09 -0500 |
|---|---|---|
| committer |   Tim Orling <ticotimo@gmail.com> | 2020-01-22 19:19:29 -0800 |
| commit | 416135458fdb6634f901c9e177d4b0685b32548b (patch) | |
| tree | 8bce892d1e9584cb9527cf5e6a792142e93c180b | |
| parent | c9651f1cf92b84216e4f873e5fa7965d671ebef7 (diff) | |
| download | meta-python2-416135458fdb6634f901c9e177d4b0685b32548b.tar.gz | |
python3-twisted: fix broken MemoryReactor import
Twisted's application/runner/test/test_runner.py was trying to import
from a deprecated module and failing. The module import has been
corrected and accepted in Twisted upstream, but there's no release
with it yet for Yocto to upgrade to, hence the backport.
(From meta-openembedded commit: e6cebf9e01232562da8e27b074fbbfe7aa66a5d2)
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Tim Orling <ticotimo@gmail.com>
| -rw-r--r-- | recipes-devtools/python/python-twisted/0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch | 37 | ||||
| -rw-r--r-- | recipes-devtools/python/python-twisted_19.10.0.bb | 5 |
2 files changed, 42 insertions, 0 deletions
diff --git a/recipes-devtools/python/python-twisted/0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch b/recipes-devtools/python/python-twisted/0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch new file mode 100644 index 0000000..4360230 --- /dev/null +++ b/recipes-devtools/python/python-twisted/0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch @@ -0,0 +1,37 @@ +From 754f21282ad2775db8ff501d40bbc497faeb17ba Mon Sep 17 00:00:00 2001 +From: Trevor Gamblin <trevor.gamblin@windriver.com> +Date: Tue, 17 Dec 2019 15:09:22 -0500 +Subject: [PATCH] fix MemoryReactor import in test_runner to be from + twisted.internet.testing + +Upstream-Status: Backport [https://github.com/twisted/twisted/commit/754f21282ad2775db8ff501d40bbc497faeb17ba] + +Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> +--- + src/twisted/application/newsfragments/9746.misc | 1 + + src/twisted/application/runner/test/test_runner.py | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + create mode 100644 src/twisted/application/newsfragments/9746.misc + +diff --git a/src/twisted/application/newsfragments/9746.misc b/src/twisted/application/newsfragments/9746.misc +new file mode 100644 +index 000000000..8b1378917 +--- /dev/null ++++ b/src/twisted/application/newsfragments/9746.misc +@@ -0,0 +1 @@ ++ +diff --git a/src/twisted/application/runner/test/test_runner.py b/src/twisted/application/runner/test/test_runner.py +index 9abc3449a..cce495b12 100644 +--- a/src/twisted/application/runner/test/test_runner.py ++++ b/src/twisted/application/runner/test/test_runner.py +@@ -15,7 +15,7 @@ from twisted.logger import ( + LogLevel, LogPublisher, LogBeginner, + FileLogObserver, FilteringLogObserver, LogLevelFilterPredicate, + ) +-from twisted.test.proto_helpers import MemoryReactor ++from twisted.internet.testing import MemoryReactor + + from ...runner import _runner + from .._exit import ExitStatus +-- +2.24.1 diff --git a/recipes-devtools/python/python-twisted_19.10.0.bb b/recipes-devtools/python/python-twisted_19.10.0.bb index a8b6a49..4e07d52 100644 --- a/recipes-devtools/python/python-twisted_19.10.0.bb +++ b/recipes-devtools/python/python-twisted_19.10.0.bb @@ -9,6 +9,11 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=1743f12d8b8f5aec625c0569a058f0a6" +# allow for common patches for python- and python3-twisted +FILESEXTRAPATHS_prepend := "${THISDIR}/python-twisted:" + +SRC_URI += "file://0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch" + SRC_URI[sha256sum] = "7394ba7f272ae722a74f3d969dcf599bc4ef093bc392038748a490f1724a515d" SRC_URI[md5sum] = "f2d70f7a66ecdf54152310164cceadfe" |