Browse Source

Merge pull request #3007 from jefferyto/twisted-16.3.0

twisted: update to 16.3.0
lilik-openwrt-22.03
Ted Hess 8 years ago
committed by GitHub
parent
commit
e96a676f9c
3 changed files with 36 additions and 36 deletions
  1. +4
    -10
      lang/twisted/Makefile
  2. +5
    -4
      lang/twisted/patches/001-fix-zsh-completion.patch
  3. +27
    -22
      lang/twisted/patches/002-omit-tests.patch

+ 4
- 10
lang/twisted/Makefile View File

@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=twisted
PKG_VERSION:=16.0.0
PKG_VERSION:=16.3.0
PKG_RELEASE:=1
PKG_SOURCE:=Twisted-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://pypi.python.org/packages/source/T/Twisted \
http://twistedmatrix.com/Releases/Twisted/16.0
PKG_MD5SUM:=c6aa35e9a1e40fce6797247f39647d2a
PKG_SOURCE_URL:=https://pypi.python.org/packages/c0/7c/c1e5b61e30b7ffc96576d2a922615c8068e6996a622be813fc626cef07aa \
http://twistedmatrix.com/Releases/Twisted/16.3
PKG_MD5SUM:=e044af844623e9fbcbe29f578db6053a
PKG_BUILD_DIR:=$(BUILD_DIR)/Twisted-$(PKG_VERSION)
PKG_BUILD_DEPENDS:=python python-setuptools USE_MUSL:librpc
@ -43,15 +43,9 @@ endef
define PyPackage/twisted/filespec
+|/usr/bin
-|/usr/bin/manhole
-|/usr/bin/tap2deb
-|/usr/bin/tap2rpm
-|/usr/bin/tkconch
+|$(PYTHON_PKG_DIR)
-|$(PYTHON_PKG_DIR)/twisted/conch/scripts/tkconch.py
-|$(PYTHON_PKG_DIR)/twisted/scripts/manhole.py
-|$(PYTHON_PKG_DIR)/twisted/scripts/tap2deb.py
-|$(PYTHON_PKG_DIR)/twisted/scripts/tap2rpm.py
endef
define Build/Compile


+ 5
- 4
lang/twisted/patches/001-fix-zsh-completion.patch View File

@ -1,8 +1,9 @@
diff -Nur a/twisted/python/twisted-completion.zsh b/twisted/python/twisted-completion.zsh
--- a/twisted/python/twisted-completion.zsh 2015-11-29 11:30:47.000000000 +0800
+++ b/twisted/python/twisted-completion.zsh 2015-11-30 20:05:59.755695237 +0800
diff --git a/twisted/python/twisted-completion.zsh b/twisted/python/twisted-completion.zsh
index 4d97aa5..9a8d4d8 100644
--- a/twisted/python/twisted-completion.zsh
+++ b/twisted/python/twisted-completion.zsh
@@ -1,4 +1,4 @@
-#compdef twistd trial conch cftp ckeygen pyhtmlizer tap2deb tkconch manhole tap2rpm
-#compdef twistd trial conch cftp ckeygen pyhtmlizer tkconch
+#compdef twistd trial conch cftp ckeygen pyhtmlizer
#
# This is the ZSH completion file for Twisted commands. It calls the current


+ 27
- 22
lang/twisted/patches/002-omit-tests.patch View File

@ -1,32 +1,37 @@
diff -Nur a/setup.py b/setup.py
--- a/setup.py 2015-11-29 11:30:46.000000000 +0800
+++ b/setup.py 2015-12-02 18:22:10.251268303 +0800
@@ -49,11 +49,11 @@
scripts = getScripts()
diff --git a/setup.py b/setup.py
index d10f17d..d347d64 100755
--- a/setup.py
+++ b/setup.py
@@ -40,11 +40,12 @@ def main(args):
setup_args = STATIC_PACKAGE_METADATA.copy()
setup_args.update(dict(
- packages=getPackages('twisted'),
+ packages=getPackages('twisted', ignore=['test']),
- packages=setuptools.find_packages(),
+ packages=setuptools.find_packages(exclude=["*.test", "*.test.*"]),
install_requires=requirements,
conditionalExtensions=getExtensions(),
scripts=scripts,
scripts=getScripts(),
include_package_data=True,
+ exclude_package_data={'':['test/*']},
zip_safe=False,
extras_require=_EXTRAS_REQUIRE,
- data_files=getDataFiles('twisted'),
+ data_files=getDataFiles('twisted', ignore=['test']),
**STATIC_PACKAGE_METADATA))
setup(**setup_args)
diff -Nur a/twisted/python/dist.py b/twisted/python/dist.py
--- a/twisted/python/dist.py 2015-11-29 11:30:47.000000000 +0800
+++ b/twisted/python/dist.py 2015-12-02 19:21:20.076370379 +0800
@@ -268,11 +268,6 @@
))
diff --git a/twisted/python/dist.py b/twisted/python/dist.py
index aac2756..5633f09 100644
--- a/twisted/python/dist.py
+++ b/twisted/python/dist.py
@@ -182,10 +182,10 @@ def getExtensions():
Get the C extensions used for Twisted.
"""
extensions = [
ConditionalExtension(
- ConditionalExtension(
- "twisted.test.raiser",
- ["twisted/test/raiser.c"],
- condition=lambda _: _isCPython),
-
- ConditionalExtension(
+ #ConditionalExtension(
+ # "twisted.test.raiser",
+ # ["twisted/test/raiser.c"],
+ # condition=lambda _: _isCPython),
ConditionalExtension(
"twisted.internet.iocpreactor.iocpsupport",
["twisted/internet/iocpreactor/iocpsupport/iocpsupport.c",
"twisted/internet/iocpreactor/iocpsupport/winsock_pointers.c"],

Loading…
Cancel
Save