Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #7438 from neheb/t

Browse source 
twisted: Update to 18.9.0
This commit is contained in:
Hannu Nyman 2018-11-17 21:31:16 +02:00 committed by GitHub
commit d70747475b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lang/python/twisted/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=twisted PKG_NAME:=twisted
PKG_VERSION:=18.4.0 PKG_VERSION:=18.9.0
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE:=Twisted-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=Twisted-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/T/Twisted PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/T/Twisted
PKG_HASH:=a4cc164a781859c74de47f17f0e85f4bce8a3321a9d0892c015c8f80c4158ad9 PKG_HASH:=294be2c6bf84ae776df2fc98e7af7d6537e1c5e60a46d33c3ce2a197677da395
PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-twisted-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-twisted-$(PKG_VERSION)
PKG_BUILD_DEPENDS:=libtirpc PKG_BUILD_DEPENDS:=libtirpc
@ -39,6 +39,7 @@ $(call Package/twisted/Default)
TITLE:=Python networking engine TITLE:=Python networking engine
DEPENDS:= \ DEPENDS:= \
+PACKAGE_twisted:python-light \ +PACKAGE_twisted:python-light \
+PACKAGE_twisted:python-attrs \
+PACKAGE_twisted:python-automat \ +PACKAGE_twisted:python-automat \
+PACKAGE_twisted:python-constantly \ +PACKAGE_twisted:python-constantly \
+PACKAGE_twisted:python-incremental \ +PACKAGE_twisted:python-incremental \

2
lang/python/twisted/patches/001-omit-tkconch.patch
View file

@ -1,6 +1,6 @@
--- a/src/twisted/python/_setup.py --- a/src/twisted/python/_setup.py
+++ b/src/twisted/python/_setup.py +++ b/src/twisted/python/_setup.py
@@ -143,7 +143,6 @@ _CONSOLE_SCRIPTS = [ @@ -144,7 +144,6 @@ _CONSOLE_SCRIPTS = [
"conch = twisted.conch.scripts.conch:run", "conch = twisted.conch.scripts.conch:run",
"mailmail = twisted.mail.scripts.mailmail:run", "mailmail = twisted.mail.scripts.mailmail:run",
"pyhtmlizer = twisted.scripts.htmlizer:run", "pyhtmlizer = twisted.scripts.htmlizer:run",

24
lang/python/twisted/patches/002-omit-tests.patch
View file

@ -1,18 +1,23 @@
--- a/src/twisted/python/_setup.py --- a/src/twisted/python/_setup.py
+++ b/src/twisted/python/_setup.py +++ b/src/twisted/python/_setup.py
@@ -169,11 +169,6 @@ class ConditionalExtension(Extension, ob @@ -169,11 +169,6 @@ class ConditionalExtension(Extension, object):
# The C extensions used for Twisted. # The C extensions used for Twisted.
_EXTENSIONS = [ _EXTENSIONS = [
ConditionalExtension( - ConditionalExtension(
- "twisted.test.raiser", - "twisted.test.raiser",
- sources=["src/twisted/test/raiser.c"], - sources=["src/twisted/test/raiser.c"],
- condition=lambda _: _isCPython), - condition=lambda _: _isCPython),
- -
- ConditionalExtension( ConditionalExtension(
"twisted.internet.iocpreactor.iocpsupport", "twisted.internet.iocpreactor.iocpsupport",
sources=[ sources=[
"src/twisted/internet/iocpreactor/iocpsupport/iocpsupport.c", @@ -238,12 +233,11 @@ def getSetupArgs(extensions=_EXTENSIONS):
@@ -240,7 +235,7 @@ def getSetupArgs(extensions=_EXTENSIONS) "incremental >= 16.10.1",
"Automat >= 0.3.0",
"hyperlink >= 17.1.1",
- "PyHamcrest >= 1.9.0",
"attrs >= 17.4.0",
] ]
arguments.update(dict( arguments.update(dict(
@ -21,11 +26,12 @@
use_incremental=True, use_incremental=True,
setup_requires=["incremental >= 16.10.1"], setup_requires=["incremental >= 16.10.1"],
install_requires=requirements, install_requires=requirements,
@@ -249,6 +244,7 @@ def getSetupArgs(extensions=_EXTENSIONS) @@ -253,7 +247,7 @@ def getSetupArgs(extensions=_EXTENSIONS):
},
cmdclass=command_classes, cmdclass=command_classes,
include_package_data=True, include_package_data=True,
+ exclude_package_data={'':['test/*']}, exclude_package_data={
- "": ["*.c", "*.h", "*.pxi", "*.pyx", "build.bat"],
+ "": ["*.c", "*.h", "*.pxi", "*.pyx", "build.bat", "test/*"],
},
zip_safe=False, zip_safe=False,
extras_require=_EXTRAS_REQUIRE, extras_require=_EXTRAS_REQUIRE,
package_dir={"": "src"},