From 4269a8b8ffe4418b454bf5ccc02baa3dd11e8776 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Mon, 25 Jun 2018 04:00:16 +0800 Subject: [PATCH] twisted: update to 18.4.0, refresh patches Signed-off-by: Jeffery To --- lang/python/twisted/Makefile | 4 ++-- ...omit-tkconch-patch => 001-omit-tkconch.patch} | 12 ++++-------- lang/python/twisted/patches/002-omit-tests.patch | 16 +++++++--------- 3 files changed, 13 insertions(+), 19 deletions(-) rename lang/python/twisted/patches/{001-omit-tkconch-patch => 001-omit-tkconch.patch} (59%) diff --git a/lang/python/twisted/Makefile b/lang/python/twisted/Makefile index 36c1a779df..35b78172bf 100644 --- a/lang/python/twisted/Makefile +++ b/lang/python/twisted/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=twisted -PKG_VERSION:=17.9.0 +PKG_VERSION:=18.4.0 PKG_RELEASE:=1 PKG_SOURCE:=Twisted-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/T/Twisted -PKG_HASH:=0da1a7e35d5fcae37bc9c7978970b5feb3bc82822155b8654ec63925c05af75c +PKG_HASH:=a4cc164a781859c74de47f17f0e85f4bce8a3321a9d0892c015c8f80c4158ad9 PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-twisted-$(PKG_VERSION) PKG_BUILD_DEPENDS:=USE_MUSL:librpc diff --git a/lang/python/twisted/patches/001-omit-tkconch-patch b/lang/python/twisted/patches/001-omit-tkconch.patch similarity index 59% rename from lang/python/twisted/patches/001-omit-tkconch-patch rename to lang/python/twisted/patches/001-omit-tkconch.patch index 05ad4c8d63..2e5e401a2e 100644 --- a/lang/python/twisted/patches/001-omit-tkconch-patch +++ b/lang/python/twisted/patches/001-omit-tkconch.patch @@ -1,22 +1,18 @@ -diff --git a/src/twisted/python/_setup.py b/src/twisted/python/_setup.py -index 3b5f69d4b..c69c5d13c 100644 --- a/src/twisted/python/_setup.py +++ b/src/twisted/python/_setup.py -@@ -142,7 +142,6 @@ _CONSOLE_SCRIPTS = [ - "cftp = twisted.conch.scripts.cftp:run", +@@ -143,7 +143,6 @@ _CONSOLE_SCRIPTS = [ "conch = twisted.conch.scripts.conch:run", + "mailmail = twisted.mail.scripts.mailmail:run", "pyhtmlizer = twisted.scripts.htmlizer:run", - "tkconch = twisted.conch.scripts.tkconch:run", "trial = twisted.scripts.trial:run", "twist = twisted.application.twist._twist:Twist.main", "twistd = twisted.scripts.twistd:run", -diff --git a/src/twisted/python/twisted-completion.zsh b/src/twisted/python/twisted-completion.zsh -index 4d97aa5d3..9a8d4d82e 100644 --- a/src/twisted/python/twisted-completion.zsh +++ b/src/twisted/python/twisted-completion.zsh @@ -1,4 +1,4 @@ --#compdef twistd trial conch cftp ckeygen pyhtmlizer tkconch -+#compdef twistd trial conch cftp ckeygen pyhtmlizer +-#compdef twist twistd trial conch cftp ckeygen pyhtmlizer tkconch ++#compdef twist twistd trial conch cftp ckeygen pyhtmlizer # # This is the ZSH completion file for Twisted commands. It calls the current # command-line with the special "--_shell-completion" option which is handled diff --git a/lang/python/twisted/patches/002-omit-tests.patch b/lang/python/twisted/patches/002-omit-tests.patch index 4649620107..7e81098077 100644 --- a/lang/python/twisted/patches/002-omit-tests.patch +++ b/lang/python/twisted/patches/002-omit-tests.patch @@ -1,21 +1,19 @@ -diff --git a/src/twisted/python/_setup.py b/src/twisted/python/_setup.py -index 3b5f69d4b..2dca47aa5 100644 --- a/src/twisted/python/_setup.py +++ b/src/twisted/python/_setup.py -@@ -175,11 +175,6 @@ class ConditionalExtension(Extension, object): - +@@ -169,11 +169,6 @@ class ConditionalExtension(Extension, ob # The C extensions used for Twisted. _EXTENSIONS = [ -- ConditionalExtension( + ConditionalExtension( - "twisted.test.raiser", - sources=["src/twisted/test/raiser.c"], - condition=lambda _: _isCPython), - - ConditionalExtension( +- ConditionalExtension( "twisted.internet.iocpreactor.iocpsupport", sources=[ -@@ -232,7 +227,7 @@ def getSetupArgs(extensions=_EXTENSIONS): - requirements.append("hyperlink >= 17.1.1") + "src/twisted/internet/iocpreactor/iocpsupport/iocpsupport.c", +@@ -240,7 +235,7 @@ def getSetupArgs(extensions=_EXTENSIONS) + ] arguments.update(dict( - packages=find_packages("src"), @@ -23,7 +21,7 @@ index 3b5f69d4b..2dca47aa5 100644 use_incremental=True, setup_requires=["incremental >= 16.10.1"], install_requires=requirements, -@@ -241,6 +236,7 @@ def getSetupArgs(extensions=_EXTENSIONS): +@@ -249,6 +244,7 @@ def getSetupArgs(extensions=_EXTENSIONS) }, cmdclass=command_classes, include_package_data=True, -- 2.30.2