From 60d327c66570b770a18cd1b06526693241170a56 Mon Sep 17 00:00:00 2001 From: Derek Straka Date: Tue, 19 Sep 2017 14:17:45 -0400 Subject: python-twisted: update version to 17.5.0 Signed-off-by: Derek Straka Signed-off-by: Martin Jansa --- .../recipes-devtools/python/python-twisted.inc | 15 ++++- .../python/python-twisted_13.2.0.bb | 4 -- .../python/python-twisted_17.5.0.bb | 4 ++ .../0001-initsendmsg-Return-NULL-on-error.patch | 76 ---------------------- .../python/python3-twisted_13.2.0.bb | 70 -------------------- .../python/python3-twisted_17.5.0.bb | 67 +++++++++++++++++++ 6 files changed, 83 insertions(+), 153 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python-twisted_13.2.0.bb create mode 100644 meta-python/recipes-devtools/python/python-twisted_17.5.0.bb delete mode 100644 meta-python/recipes-devtools/python/python3-twisted/0001-initsendmsg-Return-NULL-on-error.patch delete mode 100644 meta-python/recipes-devtools/python/python3-twisted_13.2.0.bb create mode 100644 meta-python/recipes-devtools/python/python3-twisted_17.5.0.bb diff --git a/meta-python/recipes-devtools/python/python-twisted.inc b/meta-python/recipes-devtools/python/python-twisted.inc index d734e03b36..bdb3c604ea 100644 --- a/meta-python/recipes-devtools/python/python-twisted.inc +++ b/meta-python/recipes-devtools/python/python-twisted.inc @@ -5,10 +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=5602d7228daf59a16f0f1b2640c46bca" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8a9c2fbfcba7d70504e3ba545e1820ed" -SRC_URI[md5sum] = "83fe6c0c911cc1602dbffb036be0ba79" -SRC_URI[sha256sum] = "095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3" +SRC_URI[md5sum] = "cd5c287802dcbaf7be15cf937c922b71" +SRC_URI[sha256sum] = "f198a494f0df2482f7c5f99d7f3eef33d22763ffc76641b36fec476b878002ea" PYPI_PACKAGE = "Twisted" PYPI_PACKAGE_EXT = "tar.bz2" @@ -72,12 +72,14 @@ 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 = " \ @@ -180,6 +182,9 @@ ${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}-lore = " \ @@ -236,6 +241,10 @@ ${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 \ diff --git a/meta-python/recipes-devtools/python/python-twisted_13.2.0.bb b/meta-python/recipes-devtools/python/python-twisted_13.2.0.bb deleted file mode 100644 index 3b4511077f..0000000000 --- a/meta-python/recipes-devtools/python/python-twisted_13.2.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -inherit pypi setuptools -require python-twisted.inc - -RDEPENDS_${PN}-core = "python-core python-zopeinterface python-contextlib" diff --git a/meta-python/recipes-devtools/python/python-twisted_17.5.0.bb b/meta-python/recipes-devtools/python/python-twisted_17.5.0.bb new file mode 100644 index 0000000000..3b4511077f --- /dev/null +++ b/meta-python/recipes-devtools/python/python-twisted_17.5.0.bb @@ -0,0 +1,4 @@ +inherit pypi setuptools +require python-twisted.inc + +RDEPENDS_${PN}-core = "python-core python-zopeinterface python-contextlib" diff --git a/meta-python/recipes-devtools/python/python3-twisted/0001-initsendmsg-Return-NULL-on-error.patch b/meta-python/recipes-devtools/python/python3-twisted/0001-initsendmsg-Return-NULL-on-error.patch deleted file mode 100644 index d4cf345541..0000000000 --- a/meta-python/recipes-devtools/python/python3-twisted/0001-initsendmsg-Return-NULL-on-error.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 890d039f067d52a0ab77b561d40da13f0c135634 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 3 Aug 2017 11:24:43 -0700 -Subject: [PATCH] initsendmsg: Return NULL on error - -Fixes a clang error - -sendmsg.c:129:9: error: non-void function 'initsendmsg' should return a value [-Wreturn-type] - -Signed-off-by: Khem Raj ---- - twisted/python/sendmsg.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/twisted/python/sendmsg.c b/twisted/python/sendmsg.c -index 9f2fd8c..9c080e1 100644 ---- a/twisted/python/sendmsg.c -+++ b/twisted/python/sendmsg.c -@@ -126,7 +126,7 @@ PyMODINIT_FUNC initsendmsg(void) { - module = Py_InitModule3("sendmsg", sendmsg_methods, sendmsg_doc); - - if (!module) { -- return; -+ return NULL; - } - - /* -@@ -135,39 +135,39 @@ PyMODINIT_FUNC initsendmsg(void) { - */ - - if (-1 == PyModule_AddIntConstant(module, "SCM_RIGHTS", SCM_RIGHTS)) { -- return; -+ return NULL; - } - - - /* BSD, Darwin, Hurd */ - #if defined(SCM_CREDS) - if (-1 == PyModule_AddIntConstant(module, "SCM_CREDS", SCM_CREDS)) { -- return; -+ return NULL; - } - #endif - - /* Linux */ - #if defined(SCM_CREDENTIALS) - if (-1 == PyModule_AddIntConstant(module, "SCM_CREDENTIALS", SCM_CREDENTIALS)) { -- return; -+ return NULL; - } - #endif - - /* Apparently everywhere, but not standardized. */ - #if defined(SCM_TIMESTAMP) - if (-1 == PyModule_AddIntConstant(module, "SCM_TIMESTAMP", SCM_TIMESTAMP)) { -- return; -+ return NULL; - } - #endif - - module = PyImport_ImportModule("socket"); - if (!module) { -- return; -+ return NULL; - } - - sendmsg_socket_error = PyObject_GetAttrString(module, "error"); - if (!sendmsg_socket_error) { -- return; -+ return NULL; - } - } - --- -2.13.4 - diff --git a/meta-python/recipes-devtools/python/python3-twisted_13.2.0.bb b/meta-python/recipes-devtools/python/python3-twisted_13.2.0.bb deleted file mode 100644 index 57406cd527..0000000000 --- a/meta-python/recipes-devtools/python/python3-twisted_13.2.0.bb +++ /dev/null @@ -1,70 +0,0 @@ -inherit pypi setuptools3 -require python-twisted.inc - -SRC_URI += "file://0001-initsendmsg-Return-NULL-on-error.patch \ - " - -RDEPENDS_${PN}-core = "python3-core python3-zopeinterface python3-lang" - -FILES_${PN}-core_append += " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/__pycache__ \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/__pycache__/*pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/__init__*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/notestplugin*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/testplugin*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_ftp*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_inet*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_manhole*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_portforward*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_socks*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_telnet*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_trial*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_core*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_qtstub*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_reactors*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/cred*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/dropin*.cache \ -" - -FILES_${PN}-names_append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_names*.pyc \ -" - -FILES_${PN}-news_append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_news*.pyc \ -" - -FILES_${PN}-protocols_append += " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/__pycache__/*pyc \ -" - -FILES_${PN}-conch_append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_conch*.pyc \ -" - -FILES_${PN}-lore_append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_lore*.pyc \ -" -FILES_${PN}-mail_append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_mail*.pyc \ -" - -FILES_${PN}-web_append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_web*.pyc \ -" - -FILES_${PN}-words_append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_words*.pyc \ -" - -FILES_${PN}-flow_append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_flow*.pyc \ -" - -FILES_${PN}-pair_append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_pair*.pyc \ -" - -FILES_${PN}-runner_append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_runner*.pyc \ -" diff --git a/meta-python/recipes-devtools/python/python3-twisted_17.5.0.bb b/meta-python/recipes-devtools/python/python3-twisted_17.5.0.bb new file mode 100644 index 0000000000..98016cca39 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-twisted_17.5.0.bb @@ -0,0 +1,67 @@ +inherit pypi setuptools3 +require python-twisted.inc + +RDEPENDS_${PN}-core = "python3-core python3-zopeinterface python3-lang" + +FILES_${PN}-core_append += " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/__pycache__ \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/__pycache__/*pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/__init__*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/notestplugin*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/testplugin*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_ftp*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_inet*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_manhole*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_portforward*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_socks*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_telnet*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_trial*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_core*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_qtstub*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_reactors*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/cred*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/dropin*.cache \ +" + +FILES_${PN}-names_append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_names*.pyc \ +" + +FILES_${PN}-news_append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_news*.pyc \ +" + +FILES_${PN}-protocols_append += " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/__pycache__/*pyc \ +" + +FILES_${PN}-conch_append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_conch*.pyc \ +" + +FILES_${PN}-lore_append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_lore*.pyc \ +" +FILES_${PN}-mail_append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_mail*.pyc \ +" + +FILES_${PN}-web_append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_web*.pyc \ +" + +FILES_${PN}-words_append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_words*.pyc \ +" + +FILES_${PN}-flow_append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_flow*.pyc \ +" + +FILES_${PN}-pair_append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_pair*.pyc \ +" + +FILES_${PN}-runner_append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_runner*.pyc \ +" -- cgit 1.2.3-korg