All the mail mirrored from lore.kernel.org
 help / color / mirror / Atom feed
* [meta-python][PATCH 1/5] python3-javaobj-py3: Consolidate in a single file
@ 2020-06-12 14:41 Leon Anavi
  2020-06-12 14:41 ` [meta-python][PATCH 2/5] python3-jsonpointer: " Leon Anavi
                   ` (4 more replies)
  0 siblings, 5 replies; 10+ messages in thread
From: Leon Anavi @ 2020-06-12 14:41 UTC (permalink / raw
  To: openembedded-devel; +Cc: Leon Anavi

Consolidate inc and bb files into a single bb file.

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
---
 .../python/python-javaobj-py3.inc               | 15 ---------------
 .../python/python3-javaobj-py3_0.4.0.1.bb       | 17 +++++++++++++++--
 2 files changed, 15 insertions(+), 17 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python-javaobj-py3.inc

diff --git a/meta-python/recipes-devtools/python/python-javaobj-py3.inc b/meta-python/recipes-devtools/python/python-javaobj-py3.inc
deleted file mode 100644
index e667057bc..000000000
--- a/meta-python/recipes-devtools/python/python-javaobj-py3.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY = "Module for serializing and de-serializing Java objects."
-DESCRIPTION = "python-javaobj is a python library that provides functions\
- for reading and writing (writing is WIP currently) Java objects serialized\
- or will be deserialized by ObjectOutputStream. This form of object\
- representation is a standard data interchange format in Java world."
-HOMEPAGE = "https://github.com/tcalmant/python-javaobj"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://setup.py;beginline=15;endline=27;md5=af9ce26ac2de1b7436eb08c9308b4a1e"
-
-SRC_URI[md5sum] = "352fe0df9336b8699ad0799ef152da6b"
-SRC_URI[sha256sum] = "18c44cfaa214813784a823432b4ab9829c9626b2b00072011627b4008b0067cd"
-
-inherit pypi
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.0.1.bb b/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.0.1.bb
index 0ec23ba99..49d258ca8 100644
--- a/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.0.1.bb
+++ b/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.0.1.bb
@@ -1,2 +1,15 @@
-require python-javaobj-py3.inc
-inherit setuptools3
+SUMMARY = "Module for serializing and de-serializing Java objects."
+DESCRIPTION = "python-javaobj is a python library that provides functions\
+ for reading and writing (writing is WIP currently) Java objects serialized\
+ or will be deserialized by ObjectOutputStream. This form of object\
+ representation is a standard data interchange format in Java world."
+HOMEPAGE = "https://github.com/tcalmant/python-javaobj"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://setup.py;beginline=15;endline=27;md5=af9ce26ac2de1b7436eb08c9308b4a1e"
+
+SRC_URI[md5sum] = "352fe0df9336b8699ad0799ef152da6b"
+SRC_URI[sha256sum] = "18c44cfaa214813784a823432b4ab9829c9626b2b00072011627b4008b0067cd"
+
+inherit pypi setuptools3
+
+BBCLASSEXTEND = "native nativesdk"
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [meta-python][PATCH 2/5] python3-jsonpointer: Consolidate in a single file
  2020-06-12 14:41 [meta-python][PATCH 1/5] python3-javaobj-py3: Consolidate in a single file Leon Anavi
@ 2020-06-12 14:41 ` Leon Anavi
  2020-06-12 15:38   ` [oe] " Trevor Gamblin
  2020-06-12 14:41 ` [meta-python][PATCH 3/5] python3-kconfiglib: " Leon Anavi
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 10+ messages in thread
From: Leon Anavi @ 2020-06-12 14:41 UTC (permalink / raw
  To: openembedded-devel; +Cc: Leon Anavi

Consolidate inc and bb files into a single bb file.

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
---
 .../python/python-jsonpointer.inc             | 27 -----------------
 .../python/python3-jsonpointer_2.0.bb         | 29 +++++++++++++++++--
 2 files changed, 27 insertions(+), 29 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python-jsonpointer.inc

diff --git a/meta-python/recipes-devtools/python/python-jsonpointer.inc b/meta-python/recipes-devtools/python/python-jsonpointer.inc
deleted file mode 100644
index 3e41b70b8..000000000
--- a/meta-python/recipes-devtools/python/python-jsonpointer.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-SUMMARY = "Resolve JSON Pointers in Python"
-HOMEPAGE = "https://github.com/stefankoegl/python-json-pointer"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=32b15c843b7a329130f4e266a281ebb3"
-
-inherit pypi ptest
-
-SRC_URI[md5sum] = "741b98d0e693b08b5e44e0a9da5a7bb7"
-SRC_URI[sha256sum] = "c192ba86648e05fdae4f08a17ec25180a9aef5008d973407b581798a83975362"
-
-RDEPENDS_${PN} += " \
-    ${PYTHON_PN}-json \
-"
-
-BBCLASSEXTEND = "native nativesdk"
-
-SRC_URI += " \
-	file://run-ptest \
-"
-
-RDEPENDS_${PN}-ptest += " \
-	${PYTHON_PN}-pytest \
-"
-
-do_install_ptest() {
-	cp -f ${S}/tests.py ${D}${PTEST_PATH}/
-}
diff --git a/meta-python/recipes-devtools/python/python3-jsonpointer_2.0.bb b/meta-python/recipes-devtools/python/python3-jsonpointer_2.0.bb
index 8d0a09b43..68bfe9716 100644
--- a/meta-python/recipes-devtools/python/python3-jsonpointer_2.0.bb
+++ b/meta-python/recipes-devtools/python/python3-jsonpointer_2.0.bb
@@ -1,2 +1,27 @@
-inherit setuptools3
-require python-jsonpointer.inc
+SUMMARY = "Resolve JSON Pointers in Python"
+HOMEPAGE = "https://github.com/stefankoegl/python-json-pointer"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=32b15c843b7a329130f4e266a281ebb3"
+
+inherit pypi ptest setuptools3
+
+SRC_URI[md5sum] = "741b98d0e693b08b5e44e0a9da5a7bb7"
+SRC_URI[sha256sum] = "c192ba86648e05fdae4f08a17ec25180a9aef5008d973407b581798a83975362"
+
+RDEPENDS_${PN} += " \
+    ${PYTHON_PN}-json \
+"
+
+BBCLASSEXTEND = "native nativesdk"
+
+SRC_URI += " \
+	file://run-ptest \
+"
+
+RDEPENDS_${PN}-ptest += " \
+	${PYTHON_PN}-pytest \
+"
+
+do_install_ptest() {
+	cp -f ${S}/tests.py ${D}${PTEST_PATH}/
+}
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [meta-python][PATCH 3/5] python3-kconfiglib: Consolidate in a single file
  2020-06-12 14:41 [meta-python][PATCH 1/5] python3-javaobj-py3: Consolidate in a single file Leon Anavi
  2020-06-12 14:41 ` [meta-python][PATCH 2/5] python3-jsonpointer: " Leon Anavi
@ 2020-06-12 14:41 ` Leon Anavi
  2020-06-12 15:38   ` [oe] " Trevor Gamblin
  2020-06-12 14:42 ` [meta-python][PATCH 4/5] python3-twisted: " Leon Anavi
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 10+ messages in thread
From: Leon Anavi @ 2020-06-12 14:41 UTC (permalink / raw
  To: openembedded-devel; +Cc: Leon Anavi

Consolidate inc and bb files into a single bb file.

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
---
 .../python/python3-kconfiglib_14.1.0.bb                | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/meta-python/recipes-devtools/python/python3-kconfiglib_14.1.0.bb b/meta-python/recipes-devtools/python/python3-kconfiglib_14.1.0.bb
index ab0944ff7..ec09cfc58 100644
--- a/meta-python/recipes-devtools/python/python3-kconfiglib_14.1.0.bb
+++ b/meta-python/recipes-devtools/python/python3-kconfiglib_14.1.0.bb
@@ -1,2 +1,10 @@
-require python-kconfiglib.inc
+DESCRIPTION = "Kconfiglib is a Kconfig implementation in Python"
+LICENSE = "ISC"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=712177a72a3937909543eda3ad1bfb7c"
+
+SRC_URI[md5sum] = "4ad68618824d4bad1d1de1d7eb838bba"
+SRC_URI[sha256sum] = "bed2cc2216f538eca4255a83a4588d8823563cdd50114f86cf1a2674e602c93c"
+
 inherit pypi setuptools3
+
+BBCLASSEXTEND = "native nativesdk"
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [meta-python][PATCH 4/5] python3-twisted: Consolidate in a single file
  2020-06-12 14:41 [meta-python][PATCH 1/5] python3-javaobj-py3: Consolidate in a single file Leon Anavi
  2020-06-12 14:41 ` [meta-python][PATCH 2/5] python3-jsonpointer: " Leon Anavi
  2020-06-12 14:41 ` [meta-python][PATCH 3/5] python3-kconfiglib: " Leon Anavi
@ 2020-06-12 14:42 ` Leon Anavi
  2020-06-12 15:38   ` [oe] " Trevor Gamblin
  2020-06-12 14:42 ` [meta-python][PATCH 5/5] python3-twisted: Upgrade 19.10.0 -> 20.3.0 Leon Anavi
  2020-06-12 15:38 ` [oe] [meta-python][PATCH 1/5] python3-javaobj-py3: Consolidate in a single file Trevor Gamblin
  4 siblings, 1 reply; 10+ messages in thread
From: Leon Anavi @ 2020-06-12 14:42 UTC (permalink / raw
  To: openembedded-devel; +Cc: Leon Anavi

Consolidate inc and bb files into a single bb file.

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
---
 .../python/python-twisted.inc                 | 266 ------------------
 ...r-import-in-test_runner-to-be-from-t.patch |   0
 .../python/python3-twisted_19.10.0.bb         | 264 ++++++++++++++++-
 3 files changed, 263 insertions(+), 267 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python-twisted.inc
 rename meta-python/recipes-devtools/python/{python-twisted => python3-twisted}/0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch (100%)

diff --git a/meta-python/recipes-devtools/python/python-twisted.inc b/meta-python/recipes-devtools/python/python-twisted.inc
deleted file mode 100644
index 7537bafd3..000000000
--- a/meta-python/recipes-devtools/python/python-twisted.inc
+++ /dev/null
@@ -1,266 +0,0 @@
-DESCRIPTION = "Twisted is an event-driven networking framework written in Python and licensed under the LGPL. \
-Twisted supports TCP, UDP, SSL/TLS, multicast, Unix sockets, a large number of protocols                   \
-(including HTTP, NNTP, IMAP, SSH, IRC, FTP, and others), and much more."
-HOMEPAGE = "http://www.twistedmatrix.com"
-
-#twisted/topfiles/NEWS:655: - Relicensed: Now under the MIT license, rather than LGPL.
-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"
-
-PYPI_PACKAGE = "Twisted"
-PYPI_PACKAGE_EXT = "tar.bz2"
-
-do_install_append() {
-    # remove some useless files before packaging
-    find ${D} \( -name "*.bat" -o -name "*.c" -o -name "*.h" \) -exec rm -f {} \;
-}
-
-PACKAGES += "\
-    ${PN}-zsh \
-    ${PN}-test \
-    ${PN}-protocols \
-    ${PN}-conch \
-    ${PN}-mail \
-    ${PN}-names \
-    ${PN}-news \
-    ${PN}-runner \
-    ${PN}-web \
-    ${PN}-words \
-    ${PN}-flow \
-    ${PN}-pair \
-    ${PN}-core \
-"
-
-PACKAGES =+ "\
-    ${PN}-bin \
-"
-
-DEPENDS += " \
-    ${PYTHON_PN}-incremental-native \
-"
-
-RDEPENDS_${PN} = "\
-    ${PN}-bin \
-    ${PN}-core \
-    ${PN}-conch \
-    ${PN}-mail \
-    ${PN}-names \
-    ${PN}-pair \
-    ${PN}-protocols \
-    ${PN}-runner \
-    ${PN}-web \
-    ${PN}-words \
-    ${PN}-zsh \
-"
-
-RDEPENDS_${PN}-core = "${PYTHON_PN}-appdirs \
-                       ${PYTHON_PN}-automat \
-                       ${PYTHON_PN}-constantly \
-                       ${PYTHON_PN}-core \ 
-                       ${PYTHON_PN}-debugger \
-                       ${PYTHON_PN}-hyperlink \
-                       ${PYTHON_PN}-incremental \
-                       ${PYTHON_PN}-pyhamcrest \
-                       ${PYTHON_PN}-pyserial \
-                       ${PYTHON_PN}-unixadmin \
-                       ${PYTHON_PN}-zopeinterface \
-"
-RDEPENDS_${PN}-test = "${PN}"
-RDEPENDS_${PN}-conch = "${PN}-core ${PN}-protocols ${PYTHON_PN}-bcrypt ${PYTHON_PN}-cryptography ${PYTHON_PN}-pyasn1 ${PYTHON_PN}-pickle"
-RDEPENDS_${PN}-mail = "${PN}-core ${PN}-protocols"
-RDEPENDS_${PN}-names = "${PN}-core"
-RDEPENDS_${PN}-news = "${PN}-core ${PN}-protocols"
-RDEPENDS_${PN}-runner = "${PN}-core ${PN}-protocols"
-RDEPENDS_${PN}-web += "${PN}-core ${PN}-protocols"
-RDEPENDS_${PN}-words += "${PN}-core"
-RDEPENDS_${PN}-flow += "${PN}-core"
-RDEPENDS_${PN}-pair += "${PN}-core"
-RDEPENDS_${PN}-dbg = "${PN}"
-
-ALLOW_EMPTY_${PN} = "1"
-FILES_${PN} = ""
-
-FILES_${PN}-test = " \
-    ${libdir}/${PYTHON_DIR}/site-packages/twisted/test \
-    ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/test \
-    ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/haproxy/test/ \
-"
-
-FILES_${PN}-protocols = " \
-    ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/*.py* \
-    ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/gps/ \
-    ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/mice/ \
-    ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/haproxy \
-"
-
-FILES_${PN}-zsh = " \
-    ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zsh \
-    ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.* \
-    ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/twisted-completion.zsh \
-"
-
-FILES_${PN}-conch = " \
-    ${bindir}/ckeygen \
-    ${bindir}/tkconch \
-    ${bindir}/conch \
-    ${bindir}/conchftp \
-    ${bindir}/cftp \
-    ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_conch.py* \
-    ${libdir}/${PYTHON_DIR}/site-packages/twisted/conch  \
-"
-
-FILES_${PN}-core = " \
-${bindir}/manhole \
-${bindir}/mktap \
-${bindir}/twistd \
-${bindir}/tap2deb \
-${bindir}/tap2rpm \
-${bindir}/tapconvert \
-${bindir}/tkmktap \
-${bindir}/trial \
-${bindir}/easy_install* \
-${bindir}/pyhtmlizer \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/*.so \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__init__.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/notestplugin.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/testplugin.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_ftp.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_inet.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_manhole.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_portforward.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_socks.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_telnet.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_trial.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/dropin.cache \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/application \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/cred \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/enterprise \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/internet \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/persisted \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols\
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python\
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/timeoutqueue.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/filepath.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dxprofile.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/plugin.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/htmlizer.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/__init__.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dispatch.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/hook.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadpool.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/otp.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/usage.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/roots.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/versions.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/urlpath.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/util.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/components.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/logfile.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/runtime.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/reflect.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/context.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadable.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/rebuild.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/failure.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/lockfile.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/formmethod.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/finalize.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/win32.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dist.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/shortcut.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zipstream.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/release.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/syslog.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/log.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/compat.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/procutils.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/text.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_twisted_zsh_stub \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/scripts/ \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/spread/ \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/tap/ \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/trial/ \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/__init__.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/_version.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/copyright.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/im.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/*.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/*.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/topfiles \
-${libdir}/${PYTHON_DIR}/site-packages/Twisted*egg-info \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/logger/ \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/_threads/ \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/positioning/ \
-"
-
-FILES_${PN}-mail = " \
-${bindir}/mailmail \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_mail.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/mail \
-"
-
-FILES_${PN}-names = " \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_names.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/names \
-"
-
-FILES_${PN}-news = " \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_news.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/news \
-"
-
-FILES_${PN}-runner = " \
-${libdir}/site-packages/twisted/runner/portmap.so \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/runner\
-"
-
-FILES_${PN}-web = " \
-${bindir}/websetroot \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_web.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/web\
-"
-
-FILES_${PN}-words = " \
-${bindir}/im \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_words.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/words\
-"
-
-FILES_${PN}-flow = " \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_flow.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/flow \"
-
-FILES_${PN}-pair = " \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_pair.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/pair \
-"
-
-FILES_${PN}-dbg += " \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/*/.debug \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*/.debug \
-"
-
-FILES_${PN}-doc += " \
-    ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_pydoctortemplates/ \
-"
-
-RDEPENDS_${PN}-src = "${PN}"
-FILES_${PN}-src = " \
-    ${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py \
-    ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*.py \
-    ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*/*.py \
-"
-
diff --git a/meta-python/recipes-devtools/python/python-twisted/0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch b/meta-python/recipes-devtools/python/python3-twisted/0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch
similarity index 100%
rename from meta-python/recipes-devtools/python/python-twisted/0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch
rename to meta-python/recipes-devtools/python/python3-twisted/0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch
diff --git a/meta-python/recipes-devtools/python/python3-twisted_19.10.0.bb b/meta-python/recipes-devtools/python/python3-twisted_19.10.0.bb
index c12d1cc04..f2fcd30b7 100644
--- a/meta-python/recipes-devtools/python/python3-twisted_19.10.0.bb
+++ b/meta-python/recipes-devtools/python/python3-twisted_19.10.0.bb
@@ -1,5 +1,267 @@
+DESCRIPTION = "Twisted is an event-driven networking framework written in Python and licensed under the LGPL. \
+Twisted supports TCP, UDP, SSL/TLS, multicast, Unix sockets, a large number of protocols                   \
+(including HTTP, NNTP, IMAP, SSH, IRC, FTP, and others), and much more."
+HOMEPAGE = "http://www.twistedmatrix.com"
+
+#twisted/topfiles/NEWS:655: - Relicensed: Now under the MIT license, rather than LGPL.
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1743f12d8b8f5aec625c0569a058f0a6"
+
+SRC_URI += "file://0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch"
+
+SRC_URI[sha256sum] = "7394ba7f272ae722a74f3d969dcf599bc4ef093bc392038748a490f1724a515d"
+SRC_URI[md5sum] = "f2d70f7a66ecdf54152310164cceadfe"
+
+PYPI_PACKAGE = "Twisted"
+PYPI_PACKAGE_EXT = "tar.bz2"
+
 inherit pypi setuptools3
-require python-twisted.inc
+
+do_install_append() {
+    # remove some useless files before packaging
+    find ${D} \( -name "*.bat" -o -name "*.c" -o -name "*.h" \) -exec rm -f {} \;
+}
+
+PACKAGES += "\
+    ${PN}-zsh \
+    ${PN}-test \
+    ${PN}-protocols \
+    ${PN}-conch \
+    ${PN}-mail \
+    ${PN}-names \
+    ${PN}-news \
+    ${PN}-runner \
+    ${PN}-web \
+    ${PN}-words \
+    ${PN}-flow \
+    ${PN}-pair \
+    ${PN}-core \
+"
+
+PACKAGES =+ "\
+    ${PN}-bin \
+"
+
+DEPENDS += " \
+    ${PYTHON_PN}-incremental-native \
+"
+
+RDEPENDS_${PN} = "\
+    ${PN}-bin \
+    ${PN}-core \
+    ${PN}-conch \
+    ${PN}-mail \
+    ${PN}-names \
+    ${PN}-pair \
+    ${PN}-protocols \
+    ${PN}-runner \
+    ${PN}-web \
+    ${PN}-words \
+    ${PN}-zsh \
+"
+
+RDEPENDS_${PN}-core = "${PYTHON_PN}-appdirs \
+                       ${PYTHON_PN}-automat \
+                       ${PYTHON_PN}-constantly \
+                       ${PYTHON_PN}-core \
+                       ${PYTHON_PN}-debugger \
+                       ${PYTHON_PN}-hyperlink \
+                       ${PYTHON_PN}-incremental \
+                       ${PYTHON_PN}-pyhamcrest \
+                       ${PYTHON_PN}-pyserial \
+                       ${PYTHON_PN}-unixadmin \
+                       ${PYTHON_PN}-zopeinterface \
+"
+RDEPENDS_${PN}-test = "${PN}"
+RDEPENDS_${PN}-conch = "${PN}-core ${PN}-protocols ${PYTHON_PN}-bcrypt ${PYTHON_PN}-cryptography ${PYTHON_PN}-pyasn1 ${PYTHON_PN}-pickle"
+RDEPENDS_${PN}-mail = "${PN}-core ${PN}-protocols"
+RDEPENDS_${PN}-names = "${PN}-core"
+RDEPENDS_${PN}-news = "${PN}-core ${PN}-protocols"
+RDEPENDS_${PN}-runner = "${PN}-core ${PN}-protocols"
+RDEPENDS_${PN}-web += "${PN}-core ${PN}-protocols"
+RDEPENDS_${PN}-words += "${PN}-core"
+RDEPENDS_${PN}-flow += "${PN}-core"
+RDEPENDS_${PN}-pair += "${PN}-core"
+RDEPENDS_${PN}-dbg = "${PN}"
+
+ALLOW_EMPTY_${PN} = "1"
+FILES_${PN} = ""
+
+FILES_${PN}-test = " \
+    ${libdir}/${PYTHON_DIR}/site-packages/twisted/test \
+    ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/test \
+    ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/haproxy/test/ \
+"
+
+FILES_${PN}-protocols = " \
+    ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/*.py* \
+    ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/gps/ \
+    ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/mice/ \
+    ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/haproxy \
+"
+
+FILES_${PN}-zsh = " \
+    ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zsh \
+    ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.* \
+    ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/twisted-completion.zsh \
+"
+
+FILES_${PN}-conch = " \
+    ${bindir}/ckeygen \
+    ${bindir}/tkconch \
+    ${bindir}/conch \
+    ${bindir}/conchftp \
+    ${bindir}/cftp \
+    ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_conch.py* \
+    ${libdir}/${PYTHON_DIR}/site-packages/twisted/conch  \
+"
+
+FILES_${PN}-core = " \
+${bindir}/manhole \
+${bindir}/mktap \
+${bindir}/twistd \
+${bindir}/tap2deb \
+${bindir}/tap2rpm \
+${bindir}/tapconvert \
+${bindir}/tkmktap \
+${bindir}/trial \
+${bindir}/easy_install* \
+${bindir}/pyhtmlizer \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/*.so \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__init__.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/notestplugin.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/testplugin.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_ftp.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_inet.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_manhole.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_portforward.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_socks.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_telnet.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_trial.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/dropin.cache \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/application \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/cred \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/enterprise \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/internet \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/persisted \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols\
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python\
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/timeoutqueue.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/filepath.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dxprofile.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/plugin.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/htmlizer.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/__init__.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dispatch.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/hook.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadpool.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/otp.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/usage.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/roots.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/versions.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/urlpath.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/util.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/components.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/logfile.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/runtime.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/reflect.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/context.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadable.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/rebuild.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/failure.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/lockfile.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/formmethod.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/finalize.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/win32.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dist.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/shortcut.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zipstream.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/release.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/syslog.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/log.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/compat.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/procutils.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/text.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_twisted_zsh_stub \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/scripts/ \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/spread/ \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/tap/ \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/trial/ \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/__init__.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/_version.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/copyright.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/im.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/*.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/*.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/topfiles \
+${libdir}/${PYTHON_DIR}/site-packages/Twisted*egg-info \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/logger/ \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/_threads/ \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/positioning/ \
+"
+
+FILES_${PN}-mail = " \
+${bindir}/mailmail \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_mail.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/mail \
+"
+
+FILES_${PN}-names = " \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_names.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/names \
+"
+
+FILES_${PN}-news = " \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_news.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/news \
+"
+
+FILES_${PN}-runner = " \
+${libdir}/site-packages/twisted/runner/portmap.so \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/runner\
+"
+
+FILES_${PN}-web = " \
+${bindir}/websetroot \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_web.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/web\
+"
+
+FILES_${PN}-words = " \
+${bindir}/im \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_words.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/words\
+"
+
+FILES_${PN}-flow = " \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_flow.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/flow \"
+
+FILES_${PN}-pair = " \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_pair.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/pair \
+"
+
+FILES_${PN}-dbg += " \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/*/.debug \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*/.debug \
+"
+
+FILES_${PN}-doc += " \
+    ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_pydoctortemplates/ \
+"
+
+RDEPENDS_${PN}-src = "${PN}"
+FILES_${PN}-src = " \
+    ${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py \
+    ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*.py \
+    ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*/*.py \
+"
 
 FILES_${PN}-core_append = " \
   ${libdir}/${PYTHON_DIR}/site-packages/twisted/__pycache__ \
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [meta-python][PATCH 5/5] python3-twisted: Upgrade 19.10.0 -> 20.3.0
  2020-06-12 14:41 [meta-python][PATCH 1/5] python3-javaobj-py3: Consolidate in a single file Leon Anavi
                   ` (2 preceding siblings ...)
  2020-06-12 14:42 ` [meta-python][PATCH 4/5] python3-twisted: " Leon Anavi
@ 2020-06-12 14:42 ` Leon Anavi
  2020-06-12 15:39   ` [oe] " Trevor Gamblin
  2020-06-12 15:38 ` [oe] [meta-python][PATCH 1/5] python3-javaobj-py3: Consolidate in a single file Trevor Gamblin
  4 siblings, 1 reply; 10+ messages in thread
From: Leon Anavi @ 2020-06-12 14:42 UTC (permalink / raw
  To: openembedded-devel; +Cc: Leon Anavi

Upgrade to release 20.3.0. The year in file LICENSE has been
updated but the project remains available under MIT license.
The patch for test_runner.py is no longer needed because the same
fix has been already applied in the upstream. The new release
bring the following improvements:

- Bugfixes
- Improved documentation
- twisted.news is deprecated
- twisted.conch.ssh now supports the curve25519-sha256 key
  exchange algorithm
- twisted.conch.ssh.keys can now write private keys in the new
  "openssh-key-v1" format, introduced in OpenSSH 6.5 and made the
  default in OpenSSH 7.8. ckeygen has a corresponding new
  --private-key-subtype=v1 option.

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
---
 ...r-import-in-test_runner-to-be-from-t.patch | 38 -------------------
 ...d_19.10.0.bb => python3-twisted_20.3.0.bb} |  8 ++--
 2 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python3-twisted/0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch
 rename meta-python/recipes-devtools/python/{python3-twisted_19.10.0.bb => python3-twisted_20.3.0.bb} (97%)

diff --git a/meta-python/recipes-devtools/python/python3-twisted/0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch b/meta-python/recipes-devtools/python/python3-twisted/0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch
deleted file mode 100644
index 39fc7d43e..000000000
--- a/meta-python/recipes-devtools/python/python3-twisted/0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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/meta-python/recipes-devtools/python/python3-twisted_19.10.0.bb b/meta-python/recipes-devtools/python/python3-twisted_20.3.0.bb
similarity index 97%
rename from meta-python/recipes-devtools/python/python3-twisted_19.10.0.bb
rename to meta-python/recipes-devtools/python/python3-twisted_20.3.0.bb
index f2fcd30b7..697725fd7 100644
--- a/meta-python/recipes-devtools/python/python3-twisted_19.10.0.bb
+++ b/meta-python/recipes-devtools/python/python3-twisted_20.3.0.bb
@@ -5,12 +5,10 @@ HOMEPAGE = "http://www.twistedmatrix.com"
 
 #twisted/topfiles/NEWS:655: - Relicensed: Now under the MIT license, rather than LGPL.
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1743f12d8b8f5aec625c0569a058f0a6"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=27ac6d9597237e7e76282edd7a40cd68"
 
-SRC_URI += "file://0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch"
-
-SRC_URI[sha256sum] = "7394ba7f272ae722a74f3d969dcf599bc4ef093bc392038748a490f1724a515d"
-SRC_URI[md5sum] = "f2d70f7a66ecdf54152310164cceadfe"
+SRC_URI[sha256sum] = "d72c55b5d56e176563b91d11952d13b01af8725c623e498db5507b6614fc1e10"
+SRC_URI[md5sum] = "fc16d575730db7d0cddd09fc35af3eea"
 
 PYPI_PACKAGE = "Twisted"
 PYPI_PACKAGE_EXT = "tar.bz2"
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [oe] [meta-python][PATCH 1/5] python3-javaobj-py3: Consolidate in a single file
  2020-06-12 14:41 [meta-python][PATCH 1/5] python3-javaobj-py3: Consolidate in a single file Leon Anavi
                   ` (3 preceding siblings ...)
  2020-06-12 14:42 ` [meta-python][PATCH 5/5] python3-twisted: Upgrade 19.10.0 -> 20.3.0 Leon Anavi
@ 2020-06-12 15:38 ` Trevor Gamblin
  4 siblings, 0 replies; 10+ messages in thread
From: Trevor Gamblin @ 2020-06-12 15:38 UTC (permalink / raw
  To: Leon Anavi, openembedded-devel

[-- Attachment #1: Type: text/plain, Size: 2825 bytes --]


On 6/12/20 10:41 AM, Leon Anavi wrote:
> Consolidate inc and bb files into a single bb file.
>
> Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Acked-by: Trevor Gamblin <trevor.gamblin@windriver.com>
> ---
>   .../python/python-javaobj-py3.inc               | 15 ---------------
>   .../python/python3-javaobj-py3_0.4.0.1.bb       | 17 +++++++++++++++--
>   2 files changed, 15 insertions(+), 17 deletions(-)
>   delete mode 100644 meta-python/recipes-devtools/python/python-javaobj-py3.inc
>
> diff --git a/meta-python/recipes-devtools/python/python-javaobj-py3.inc b/meta-python/recipes-devtools/python/python-javaobj-py3.inc
> deleted file mode 100644
> index e667057bc..000000000
> --- a/meta-python/recipes-devtools/python/python-javaobj-py3.inc
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -SUMMARY = "Module for serializing and de-serializing Java objects."
> -DESCRIPTION = "python-javaobj is a python library that provides functions\
> - for reading and writing (writing is WIP currently) Java objects serialized\
> - or will be deserialized by ObjectOutputStream. This form of object\
> - representation is a standard data interchange format in Java world."
> -HOMEPAGE = "https://github.com/tcalmant/python-javaobj"
> -LICENSE = "Apache-2.0"
> -LIC_FILES_CHKSUM = "file://setup.py;beginline=15;endline=27;md5=af9ce26ac2de1b7436eb08c9308b4a1e"
> -
> -SRC_URI[md5sum] = "352fe0df9336b8699ad0799ef152da6b"
> -SRC_URI[sha256sum] = "18c44cfaa214813784a823432b4ab9829c9626b2b00072011627b4008b0067cd"
> -
> -inherit pypi
> -
> -BBCLASSEXTEND = "native nativesdk"
> diff --git a/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.0.1.bb b/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.0.1.bb
> index 0ec23ba99..49d258ca8 100644
> --- a/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.0.1.bb
> +++ b/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.0.1.bb
> @@ -1,2 +1,15 @@
> -require python-javaobj-py3.inc
> -inherit setuptools3
> +SUMMARY = "Module for serializing and de-serializing Java objects."
> +DESCRIPTION = "python-javaobj is a python library that provides functions\
> + for reading and writing (writing is WIP currently) Java objects serialized\
> + or will be deserialized by ObjectOutputStream. This form of object\
> + representation is a standard data interchange format in Java world."
> +HOMEPAGE = "https://github.com/tcalmant/python-javaobj"
> +LICENSE = "Apache-2.0"
> +LIC_FILES_CHKSUM = "file://setup.py;beginline=15;endline=27;md5=af9ce26ac2de1b7436eb08c9308b4a1e"
> +
> +SRC_URI[md5sum] = "352fe0df9336b8699ad0799ef152da6b"
> +SRC_URI[sha256sum] = "18c44cfaa214813784a823432b4ab9829c9626b2b00072011627b4008b0067cd"
> +
> +inherit pypi setuptools3
> +
> +BBCLASSEXTEND = "native nativesdk"
>
> 

[-- Attachment #2: Type: text/html, Size: 4705 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [oe] [meta-python][PATCH 2/5] python3-jsonpointer: Consolidate in a single file
  2020-06-12 14:41 ` [meta-python][PATCH 2/5] python3-jsonpointer: " Leon Anavi
@ 2020-06-12 15:38   ` Trevor Gamblin
  0 siblings, 0 replies; 10+ messages in thread
From: Trevor Gamblin @ 2020-06-12 15:38 UTC (permalink / raw
  To: Leon Anavi, openembedded-devel

[-- Attachment #1: Type: text/plain, Size: 2675 bytes --]


On 6/12/20 10:41 AM, Leon Anavi wrote:
> Consolidate inc and bb files into a single bb file.
>
> Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Acked-by: Trevor Gamblin <trevor.gamblin@windriver.com>
> ---
>   .../python/python-jsonpointer.inc             | 27 -----------------
>   .../python/python3-jsonpointer_2.0.bb         | 29 +++++++++++++++++--
>   2 files changed, 27 insertions(+), 29 deletions(-)
>   delete mode 100644 meta-python/recipes-devtools/python/python-jsonpointer.inc
>
> diff --git a/meta-python/recipes-devtools/python/python-jsonpointer.inc b/meta-python/recipes-devtools/python/python-jsonpointer.inc
> deleted file mode 100644
> index 3e41b70b8..000000000
> --- a/meta-python/recipes-devtools/python/python-jsonpointer.inc
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -SUMMARY = "Resolve JSON Pointers in Python"
> -HOMEPAGE = "https://github.com/stefankoegl/python-json-pointer"
> -LICENSE = "BSD-3-Clause"
> -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=32b15c843b7a329130f4e266a281ebb3"
> -
> -inherit pypi ptest
> -
> -SRC_URI[md5sum] = "741b98d0e693b08b5e44e0a9da5a7bb7"
> -SRC_URI[sha256sum] = "c192ba86648e05fdae4f08a17ec25180a9aef5008d973407b581798a83975362"
> -
> -RDEPENDS_${PN} += " \
> -    ${PYTHON_PN}-json \
> -"
> -
> -BBCLASSEXTEND = "native nativesdk"
> -
> -SRC_URI += " \
> -	file://run-ptest \
> -"
> -
> -RDEPENDS_${PN}-ptest += " \
> -	${PYTHON_PN}-pytest \
> -"
> -
> -do_install_ptest() {
> -	cp -f ${S}/tests.py ${D}${PTEST_PATH}/
> -}
> diff --git a/meta-python/recipes-devtools/python/python3-jsonpointer_2.0.bb b/meta-python/recipes-devtools/python/python3-jsonpointer_2.0.bb
> index 8d0a09b43..68bfe9716 100644
> --- a/meta-python/recipes-devtools/python/python3-jsonpointer_2.0.bb
> +++ b/meta-python/recipes-devtools/python/python3-jsonpointer_2.0.bb
> @@ -1,2 +1,27 @@
> -inherit setuptools3
> -require python-jsonpointer.inc
> +SUMMARY = "Resolve JSON Pointers in Python"
> +HOMEPAGE = "https://github.com/stefankoegl/python-json-pointer"
> +LICENSE = "BSD-3-Clause"
> +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=32b15c843b7a329130f4e266a281ebb3"
> +
> +inherit pypi ptest setuptools3
> +
> +SRC_URI[md5sum] = "741b98d0e693b08b5e44e0a9da5a7bb7"
> +SRC_URI[sha256sum] = "c192ba86648e05fdae4f08a17ec25180a9aef5008d973407b581798a83975362"
> +
> +RDEPENDS_${PN} += " \
> +    ${PYTHON_PN}-json \
> +"
> +
> +BBCLASSEXTEND = "native nativesdk"
> +
> +SRC_URI += " \
> +	file://run-ptest \
> +"
> +
> +RDEPENDS_${PN}-ptest += " \
> +	${PYTHON_PN}-pytest \
> +"
> +
> +do_install_ptest() {
> +	cp -f ${S}/tests.py ${D}${PTEST_PATH}/
> +}
>
> 

[-- Attachment #2: Type: text/html, Size: 4258 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [oe] [meta-python][PATCH 3/5] python3-kconfiglib: Consolidate in a single file
  2020-06-12 14:41 ` [meta-python][PATCH 3/5] python3-kconfiglib: " Leon Anavi
@ 2020-06-12 15:38   ` Trevor Gamblin
  0 siblings, 0 replies; 10+ messages in thread
From: Trevor Gamblin @ 2020-06-12 15:38 UTC (permalink / raw
  To: Leon Anavi, openembedded-devel

[-- Attachment #1: Type: text/plain, Size: 1147 bytes --]


On 6/12/20 10:41 AM, Leon Anavi wrote:
> Consolidate inc and bb files into a single bb file.
>
> Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Acked-by: Trevor Gamblin <trevor.gamblin@windriver.com>
> ---
>   .../python/python3-kconfiglib_14.1.0.bb                | 10 +++++++++-
>   1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/meta-python/recipes-devtools/python/python3-kconfiglib_14.1.0.bb b/meta-python/recipes-devtools/python/python3-kconfiglib_14.1.0.bb
> index ab0944ff7..ec09cfc58 100644
> --- a/meta-python/recipes-devtools/python/python3-kconfiglib_14.1.0.bb
> +++ b/meta-python/recipes-devtools/python/python3-kconfiglib_14.1.0.bb
> @@ -1,2 +1,10 @@
> -require python-kconfiglib.inc
> +DESCRIPTION = "Kconfiglib is a Kconfig implementation in Python"
> +LICENSE = "ISC"
> +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=712177a72a3937909543eda3ad1bfb7c"
> +
> +SRC_URI[md5sum] = "4ad68618824d4bad1d1de1d7eb838bba"
> +SRC_URI[sha256sum] = "bed2cc2216f538eca4255a83a4588d8823563cdd50114f86cf1a2674e602c93c"
> +
>   inherit pypi setuptools3
> +
> +BBCLASSEXTEND = "native nativesdk"
>
> 

[-- Attachment #2: Type: text/html, Size: 2141 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [oe] [meta-python][PATCH 4/5] python3-twisted: Consolidate in a single file
  2020-06-12 14:42 ` [meta-python][PATCH 4/5] python3-twisted: " Leon Anavi
@ 2020-06-12 15:38   ` Trevor Gamblin
  0 siblings, 0 replies; 10+ messages in thread
From: Trevor Gamblin @ 2020-06-12 15:38 UTC (permalink / raw
  To: Leon Anavi, openembedded-devel

[-- Attachment #1: Type: text/plain, Size: 25383 bytes --]


On 6/12/20 10:42 AM, Leon Anavi wrote:
> Consolidate inc and bb files into a single bb file.
>
> Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Acked-by: Trevor Gamblin <trevor.gamblin@windriver.com>
> ---
>   .../python/python-twisted.inc                 | 266 ------------------
>   ...r-import-in-test_runner-to-be-from-t.patch |   0
>   .../python/python3-twisted_19.10.0.bb         | 264 ++++++++++++++++-
>   3 files changed, 263 insertions(+), 267 deletions(-)
>   delete mode 100644 meta-python/recipes-devtools/python/python-twisted.inc
>   rename meta-python/recipes-devtools/python/{python-twisted => python3-twisted}/0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch (100%)
>
> diff --git a/meta-python/recipes-devtools/python/python-twisted.inc b/meta-python/recipes-devtools/python/python-twisted.inc
> deleted file mode 100644
> index 7537bafd3..000000000
> --- a/meta-python/recipes-devtools/python/python-twisted.inc
> +++ /dev/null
> @@ -1,266 +0,0 @@
> -DESCRIPTION = "Twisted is an event-driven networking framework written in Python and licensed under the LGPL. \
> -Twisted supports TCP, UDP, SSL/TLS, multicast, Unix sockets, a large number of protocols                   \
> -(including HTTP, NNTP, IMAP, SSH, IRC, FTP, and others), and much more."
> -HOMEPAGE = "http://www.twistedmatrix.com"
> -
> -#twisted/topfiles/NEWS:655: - Relicensed: Now under the MIT license, rather than LGPL.
> -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"
> -
> -PYPI_PACKAGE = "Twisted"
> -PYPI_PACKAGE_EXT = "tar.bz2"
> -
> -do_install_append() {
> -    # remove some useless files before packaging
> -    find ${D} \( -name "*.bat" -o -name "*.c" -o -name "*.h" \) -exec rm -f {} \;
> -}
> -
> -PACKAGES += "\
> -    ${PN}-zsh \
> -    ${PN}-test \
> -    ${PN}-protocols \
> -    ${PN}-conch \
> -    ${PN}-mail \
> -    ${PN}-names \
> -    ${PN}-news \
> -    ${PN}-runner \
> -    ${PN}-web \
> -    ${PN}-words \
> -    ${PN}-flow \
> -    ${PN}-pair \
> -    ${PN}-core \
> -"
> -
> -PACKAGES =+ "\
> -    ${PN}-bin \
> -"
> -
> -DEPENDS += " \
> -    ${PYTHON_PN}-incremental-native \
> -"
> -
> -RDEPENDS_${PN} = "\
> -    ${PN}-bin \
> -    ${PN}-core \
> -    ${PN}-conch \
> -    ${PN}-mail \
> -    ${PN}-names \
> -    ${PN}-pair \
> -    ${PN}-protocols \
> -    ${PN}-runner \
> -    ${PN}-web \
> -    ${PN}-words \
> -    ${PN}-zsh \
> -"
> -
> -RDEPENDS_${PN}-core = "${PYTHON_PN}-appdirs \
> -                       ${PYTHON_PN}-automat \
> -                       ${PYTHON_PN}-constantly \
> -                       ${PYTHON_PN}-core \
> -                       ${PYTHON_PN}-debugger \
> -                       ${PYTHON_PN}-hyperlink \
> -                       ${PYTHON_PN}-incremental \
> -                       ${PYTHON_PN}-pyhamcrest \
> -                       ${PYTHON_PN}-pyserial \
> -                       ${PYTHON_PN}-unixadmin \
> -                       ${PYTHON_PN}-zopeinterface \
> -"
> -RDEPENDS_${PN}-test = "${PN}"
> -RDEPENDS_${PN}-conch = "${PN}-core ${PN}-protocols ${PYTHON_PN}-bcrypt ${PYTHON_PN}-cryptography ${PYTHON_PN}-pyasn1 ${PYTHON_PN}-pickle"
> -RDEPENDS_${PN}-mail = "${PN}-core ${PN}-protocols"
> -RDEPENDS_${PN}-names = "${PN}-core"
> -RDEPENDS_${PN}-news = "${PN}-core ${PN}-protocols"
> -RDEPENDS_${PN}-runner = "${PN}-core ${PN}-protocols"
> -RDEPENDS_${PN}-web += "${PN}-core ${PN}-protocols"
> -RDEPENDS_${PN}-words += "${PN}-core"
> -RDEPENDS_${PN}-flow += "${PN}-core"
> -RDEPENDS_${PN}-pair += "${PN}-core"
> -RDEPENDS_${PN}-dbg = "${PN}"
> -
> -ALLOW_EMPTY_${PN} = "1"
> -FILES_${PN} = ""
> -
> -FILES_${PN}-test = " \
> -    ${libdir}/${PYTHON_DIR}/site-packages/twisted/test \
> -    ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/test \
> -    ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/haproxy/test/ \
> -"
> -
> -FILES_${PN}-protocols = " \
> -    ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/*.py* \
> -    ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/gps/ \
> -    ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/mice/ \
> -    ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/haproxy \
> -"
> -
> -FILES_${PN}-zsh = " \
> -    ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zsh \
> -    ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.* \
> -    ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/twisted-completion.zsh \
> -"
> -
> -FILES_${PN}-conch = " \
> -    ${bindir}/ckeygen \
> -    ${bindir}/tkconch \
> -    ${bindir}/conch \
> -    ${bindir}/conchftp \
> -    ${bindir}/cftp \
> -    ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_conch.py* \
> -    ${libdir}/${PYTHON_DIR}/site-packages/twisted/conch  \
> -"
> -
> -FILES_${PN}-core = " \
> -${bindir}/manhole \
> -${bindir}/mktap \
> -${bindir}/twistd \
> -${bindir}/tap2deb \
> -${bindir}/tap2rpm \
> -${bindir}/tapconvert \
> -${bindir}/tkmktap \
> -${bindir}/trial \
> -${bindir}/easy_install* \
> -${bindir}/pyhtmlizer \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/*.so \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__init__.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/notestplugin.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/testplugin.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_ftp.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_inet.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_manhole.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_portforward.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_socks.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_telnet.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_trial.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/dropin.cache \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/application \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/cred \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/enterprise \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/internet \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/persisted \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols\
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python\
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/timeoutqueue.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/filepath.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dxprofile.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/plugin.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/htmlizer.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/__init__.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dispatch.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/hook.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadpool.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/otp.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/usage.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/roots.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/versions.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/urlpath.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/util.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/components.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/logfile.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/runtime.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/reflect.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/context.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadable.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/rebuild.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/failure.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/lockfile.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/formmethod.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/finalize.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/win32.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dist.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/shortcut.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zipstream.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/release.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/syslog.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/log.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/compat.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/procutils.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/text.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_twisted_zsh_stub \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/scripts/ \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/spread/ \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/tap/ \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/trial/ \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/__init__.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/_version.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/copyright.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/im.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/*.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/*.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/topfiles \
> -${libdir}/${PYTHON_DIR}/site-packages/Twisted*egg-info \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/logger/ \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/_threads/ \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/positioning/ \
> -"
> -
> -FILES_${PN}-mail = " \
> -${bindir}/mailmail \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_mail.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/mail \
> -"
> -
> -FILES_${PN}-names = " \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_names.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/names \
> -"
> -
> -FILES_${PN}-news = " \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_news.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/news \
> -"
> -
> -FILES_${PN}-runner = " \
> -${libdir}/site-packages/twisted/runner/portmap.so \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/runner\
> -"
> -
> -FILES_${PN}-web = " \
> -${bindir}/websetroot \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_web.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/web\
> -"
> -
> -FILES_${PN}-words = " \
> -${bindir}/im \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_words.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/words\
> -"
> -
> -FILES_${PN}-flow = " \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_flow.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/flow \"
> -
> -FILES_${PN}-pair = " \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_pair.py* \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/pair \
> -"
> -
> -FILES_${PN}-dbg += " \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/*/.debug \
> -${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*/.debug \
> -"
> -
> -FILES_${PN}-doc += " \
> -    ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_pydoctortemplates/ \
> -"
> -
> -RDEPENDS_${PN}-src = "${PN}"
> -FILES_${PN}-src = " \
> -    ${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py \
> -    ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*.py \
> -    ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*/*.py \
> -"
> -
> diff --git a/meta-python/recipes-devtools/python/python-twisted/0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch b/meta-python/recipes-devtools/python/python3-twisted/0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch
> similarity index 100%
> rename from meta-python/recipes-devtools/python/python-twisted/0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch
> rename to meta-python/recipes-devtools/python/python3-twisted/0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch
> diff --git a/meta-python/recipes-devtools/python/python3-twisted_19.10.0.bb b/meta-python/recipes-devtools/python/python3-twisted_19.10.0.bb
> index c12d1cc04..f2fcd30b7 100644
> --- a/meta-python/recipes-devtools/python/python3-twisted_19.10.0.bb
> +++ b/meta-python/recipes-devtools/python/python3-twisted_19.10.0.bb
> @@ -1,5 +1,267 @@
> +DESCRIPTION = "Twisted is an event-driven networking framework written in Python and licensed under the LGPL. \
> +Twisted supports TCP, UDP, SSL/TLS, multicast, Unix sockets, a large number of protocols                   \
> +(including HTTP, NNTP, IMAP, SSH, IRC, FTP, and others), and much more."
> +HOMEPAGE = "http://www.twistedmatrix.com"
> +
> +#twisted/topfiles/NEWS:655: - Relicensed: Now under the MIT license, rather than LGPL.
> +LICENSE = "MIT"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=1743f12d8b8f5aec625c0569a058f0a6"
> +
> +SRC_URI += "file://0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch"
> +
> +SRC_URI[sha256sum] = "7394ba7f272ae722a74f3d969dcf599bc4ef093bc392038748a490f1724a515d"
> +SRC_URI[md5sum] = "f2d70f7a66ecdf54152310164cceadfe"
> +
> +PYPI_PACKAGE = "Twisted"
> +PYPI_PACKAGE_EXT = "tar.bz2"
> +
>   inherit pypi setuptools3
> -require python-twisted.inc
> +
> +do_install_append() {
> +    # remove some useless files before packaging
> +    find ${D} \( -name "*.bat" -o -name "*.c" -o -name "*.h" \) -exec rm -f {} \;
> +}
> +
> +PACKAGES += "\
> +    ${PN}-zsh \
> +    ${PN}-test \
> +    ${PN}-protocols \
> +    ${PN}-conch \
> +    ${PN}-mail \
> +    ${PN}-names \
> +    ${PN}-news \
> +    ${PN}-runner \
> +    ${PN}-web \
> +    ${PN}-words \
> +    ${PN}-flow \
> +    ${PN}-pair \
> +    ${PN}-core \
> +"
> +
> +PACKAGES =+ "\
> +    ${PN}-bin \
> +"
> +
> +DEPENDS += " \
> +    ${PYTHON_PN}-incremental-native \
> +"
> +
> +RDEPENDS_${PN} = "\
> +    ${PN}-bin \
> +    ${PN}-core \
> +    ${PN}-conch \
> +    ${PN}-mail \
> +    ${PN}-names \
> +    ${PN}-pair \
> +    ${PN}-protocols \
> +    ${PN}-runner \
> +    ${PN}-web \
> +    ${PN}-words \
> +    ${PN}-zsh \
> +"
> +
> +RDEPENDS_${PN}-core = "${PYTHON_PN}-appdirs \
> +                       ${PYTHON_PN}-automat \
> +                       ${PYTHON_PN}-constantly \
> +                       ${PYTHON_PN}-core \
> +                       ${PYTHON_PN}-debugger \
> +                       ${PYTHON_PN}-hyperlink \
> +                       ${PYTHON_PN}-incremental \
> +                       ${PYTHON_PN}-pyhamcrest \
> +                       ${PYTHON_PN}-pyserial \
> +                       ${PYTHON_PN}-unixadmin \
> +                       ${PYTHON_PN}-zopeinterface \
> +"
> +RDEPENDS_${PN}-test = "${PN}"
> +RDEPENDS_${PN}-conch = "${PN}-core ${PN}-protocols ${PYTHON_PN}-bcrypt ${PYTHON_PN}-cryptography ${PYTHON_PN}-pyasn1 ${PYTHON_PN}-pickle"
> +RDEPENDS_${PN}-mail = "${PN}-core ${PN}-protocols"
> +RDEPENDS_${PN}-names = "${PN}-core"
> +RDEPENDS_${PN}-news = "${PN}-core ${PN}-protocols"
> +RDEPENDS_${PN}-runner = "${PN}-core ${PN}-protocols"
> +RDEPENDS_${PN}-web += "${PN}-core ${PN}-protocols"
> +RDEPENDS_${PN}-words += "${PN}-core"
> +RDEPENDS_${PN}-flow += "${PN}-core"
> +RDEPENDS_${PN}-pair += "${PN}-core"
> +RDEPENDS_${PN}-dbg = "${PN}"
> +
> +ALLOW_EMPTY_${PN} = "1"
> +FILES_${PN} = ""
> +
> +FILES_${PN}-test = " \
> +    ${libdir}/${PYTHON_DIR}/site-packages/twisted/test \
> +    ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/test \
> +    ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/haproxy/test/ \
> +"
> +
> +FILES_${PN}-protocols = " \
> +    ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/*.py* \
> +    ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/gps/ \
> +    ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/mice/ \
> +    ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/haproxy \
> +"
> +
> +FILES_${PN}-zsh = " \
> +    ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zsh \
> +    ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.* \
> +    ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/twisted-completion.zsh \
> +"
> +
> +FILES_${PN}-conch = " \
> +    ${bindir}/ckeygen \
> +    ${bindir}/tkconch \
> +    ${bindir}/conch \
> +    ${bindir}/conchftp \
> +    ${bindir}/cftp \
> +    ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_conch.py* \
> +    ${libdir}/${PYTHON_DIR}/site-packages/twisted/conch  \
> +"
> +
> +FILES_${PN}-core = " \
> +${bindir}/manhole \
> +${bindir}/mktap \
> +${bindir}/twistd \
> +${bindir}/tap2deb \
> +${bindir}/tap2rpm \
> +${bindir}/tapconvert \
> +${bindir}/tkmktap \
> +${bindir}/trial \
> +${bindir}/easy_install* \
> +${bindir}/pyhtmlizer \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/*.so \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__init__.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/notestplugin.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/testplugin.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_ftp.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_inet.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_manhole.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_portforward.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_socks.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_telnet.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_trial.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/dropin.cache \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/application \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/cred \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/enterprise \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/internet \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/persisted \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols\
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python\
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/timeoutqueue.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/filepath.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dxprofile.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/plugin.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/htmlizer.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/__init__.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dispatch.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/hook.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadpool.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/otp.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/usage.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/roots.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/versions.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/urlpath.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/util.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/components.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/logfile.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/runtime.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/reflect.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/context.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadable.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/rebuild.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/failure.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/lockfile.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/formmethod.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/finalize.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/win32.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dist.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/shortcut.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zipstream.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/release.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/syslog.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/log.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/compat.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/procutils.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/text.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_twisted_zsh_stub \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/scripts/ \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/spread/ \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/tap/ \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/trial/ \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/__init__.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/_version.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/copyright.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/im.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/*.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/*.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/topfiles \
> +${libdir}/${PYTHON_DIR}/site-packages/Twisted*egg-info \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/logger/ \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/_threads/ \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/positioning/ \
> +"
> +
> +FILES_${PN}-mail = " \
> +${bindir}/mailmail \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_mail.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/mail \
> +"
> +
> +FILES_${PN}-names = " \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_names.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/names \
> +"
> +
> +FILES_${PN}-news = " \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_news.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/news \
> +"
> +
> +FILES_${PN}-runner = " \
> +${libdir}/site-packages/twisted/runner/portmap.so \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/runner\
> +"
> +
> +FILES_${PN}-web = " \
> +${bindir}/websetroot \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_web.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/web\
> +"
> +
> +FILES_${PN}-words = " \
> +${bindir}/im \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_words.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/words\
> +"
> +
> +FILES_${PN}-flow = " \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_flow.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/flow \"
> +
> +FILES_${PN}-pair = " \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_pair.py* \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/pair \
> +"
> +
> +FILES_${PN}-dbg += " \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/*/.debug \
> +${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*/.debug \
> +"
> +
> +FILES_${PN}-doc += " \
> +    ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_pydoctortemplates/ \
> +"
> +
> +RDEPENDS_${PN}-src = "${PN}"
> +FILES_${PN}-src = " \
> +    ${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py \
> +    ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*.py \
> +    ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*/*.py \
> +"
>   
>   FILES_${PN}-core_append = " \
>     ${libdir}/${PYTHON_DIR}/site-packages/twisted/__pycache__ \
>
> 

[-- Attachment #2: Type: text/html, Size: 27909 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [oe] [meta-python][PATCH 5/5] python3-twisted: Upgrade 19.10.0 -> 20.3.0
  2020-06-12 14:42 ` [meta-python][PATCH 5/5] python3-twisted: Upgrade 19.10.0 -> 20.3.0 Leon Anavi
@ 2020-06-12 15:39   ` Trevor Gamblin
  0 siblings, 0 replies; 10+ messages in thread
From: Trevor Gamblin @ 2020-06-12 15:39 UTC (permalink / raw
  To: Leon Anavi, openembedded-devel

[-- Attachment #1: Type: text/plain, Size: 4761 bytes --]


On 6/12/20 10:42 AM, Leon Anavi wrote:
> Upgrade to release 20.3.0. The year in file LICENSE has been
> updated but the project remains available under MIT license.
> The patch for test_runner.py is no longer needed because the same
> fix has been already applied in the upstream. The new release
> bring the following improvements:
>
> - Bugfixes
> - Improved documentation
> - twisted.news is deprecated
> - twisted.conch.ssh now supports the curve25519-sha256 key
>    exchange algorithm
> - twisted.conch.ssh.keys can now write private keys in the new
>    "openssh-key-v1" format, introduced in OpenSSH 6.5 and made the
>    default in OpenSSH 7.8. ckeygen has a corresponding new
>    --private-key-subtype=v1 option.
>
> Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Acked-by: Trevor Gamblin <trevor.gamblin@windriver.com>
> ---
>   ...r-import-in-test_runner-to-be-from-t.patch | 38 -------------------
>   ...d_19.10.0.bb => python3-twisted_20.3.0.bb} |  8 ++--
>   2 files changed, 3 insertions(+), 43 deletions(-)
>   delete mode 100644 meta-python/recipes-devtools/python/python3-twisted/0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch
>   rename meta-python/recipes-devtools/python/{python3-twisted_19.10.0.bb => python3-twisted_20.3.0.bb} (97%)
>
> diff --git a/meta-python/recipes-devtools/python/python3-twisted/0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch b/meta-python/recipes-devtools/python/python3-twisted/0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch
> deleted file mode 100644
> index 39fc7d43e..000000000
> --- a/meta-python/recipes-devtools/python/python3-twisted/0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch
> +++ /dev/null
> @@ -1,38 +0,0 @@
> -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/meta-python/recipes-devtools/python/python3-twisted_19.10.0.bb b/meta-python/recipes-devtools/python/python3-twisted_20.3.0.bb
> similarity index 97%
> rename from meta-python/recipes-devtools/python/python3-twisted_19.10.0.bb
> rename to meta-python/recipes-devtools/python/python3-twisted_20.3.0.bb
> index f2fcd30b7..697725fd7 100644
> --- a/meta-python/recipes-devtools/python/python3-twisted_19.10.0.bb
> +++ b/meta-python/recipes-devtools/python/python3-twisted_20.3.0.bb
> @@ -5,12 +5,10 @@ HOMEPAGE = "http://www.twistedmatrix.com"
>   
>   #twisted/topfiles/NEWS:655: - Relicensed: Now under the MIT license, rather than LGPL.
>   LICENSE = "MIT"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=1743f12d8b8f5aec625c0569a058f0a6"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=27ac6d9597237e7e76282edd7a40cd68"
>   
> -SRC_URI += "file://0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch"
> -
> -SRC_URI[sha256sum] = "7394ba7f272ae722a74f3d969dcf599bc4ef093bc392038748a490f1724a515d"
> -SRC_URI[md5sum] = "f2d70f7a66ecdf54152310164cceadfe"
> +SRC_URI[sha256sum] = "d72c55b5d56e176563b91d11952d13b01af8725c623e498db5507b6614fc1e10"
> +SRC_URI[md5sum] = "fc16d575730db7d0cddd09fc35af3eea"
>   
>   PYPI_PACKAGE = "Twisted"
>   PYPI_PACKAGE_EXT = "tar.bz2"
>
> 

[-- Attachment #2: Type: text/html, Size: 6327 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2020-06-12 15:39 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-12 14:41 [meta-python][PATCH 1/5] python3-javaobj-py3: Consolidate in a single file Leon Anavi
2020-06-12 14:41 ` [meta-python][PATCH 2/5] python3-jsonpointer: " Leon Anavi
2020-06-12 15:38   ` [oe] " Trevor Gamblin
2020-06-12 14:41 ` [meta-python][PATCH 3/5] python3-kconfiglib: " Leon Anavi
2020-06-12 15:38   ` [oe] " Trevor Gamblin
2020-06-12 14:42 ` [meta-python][PATCH 4/5] python3-twisted: " Leon Anavi
2020-06-12 15:38   ` [oe] " Trevor Gamblin
2020-06-12 14:42 ` [meta-python][PATCH 5/5] python3-twisted: Upgrade 19.10.0 -> 20.3.0 Leon Anavi
2020-06-12 15:39   ` [oe] " Trevor Gamblin
2020-06-12 15:38 ` [oe] [meta-python][PATCH 1/5] python3-javaobj-py3: Consolidate in a single file Trevor Gamblin

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.