mirror of
https://github.com/openwrt/packages.git
synced 2025-12-23 10:14:32 +04:00
twisted: updated to 17.9.0, add src package
There have been some new dependencies added in recent versions of Twisted (mostly internal classes that have been spun out into their own libraries): * constantly (#5453), since 16.5.0 * incremental (#5454), since 16.5.0 * Automat (#5456), since 17.1.0 * hyperlink (#5455) since 17.5.0 Signed-off-by: Jeffery To <jeffery.to@gmail.com>
This commit is contained in:
@@ -1,10 +0,0 @@
|
||||
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 tkconch
|
||||
+#compdef 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
|
||||
22
lang/python/twisted/patches/001-omit-tkconch-patch
Normal file
22
lang/python/twisted/patches/001-omit-tkconch-patch
Normal file
@@ -0,0 +1,22 @@
|
||||
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",
|
||||
"conch = twisted.conch.scripts.conch: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
|
||||
#
|
||||
# This is the ZSH completion file for Twisted commands. It calls the current
|
||||
# command-line with the special "--_shell-completion" option which is handled
|
||||
@@ -1,41 +1,33 @@
|
||||
diff --git a/setup.py b/setup.py
|
||||
index e21ef70..a4d9ee8 100755
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -55,13 +55,14 @@ def main(args):
|
||||
setup_args = STATIC_PACKAGE_METADATA.copy()
|
||||
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):
|
||||
|
||||
setup_args.update(dict(
|
||||
- packages=setuptools.find_packages(),
|
||||
+ packages=setuptools.find_packages(exclude=["*.test", "*.test.*"]),
|
||||
# The C extensions used for Twisted.
|
||||
_EXTENSIONS = [
|
||||
- ConditionalExtension(
|
||||
- "twisted.test.raiser",
|
||||
- sources=["src/twisted/test/raiser.c"],
|
||||
- condition=lambda _: _isCPython),
|
||||
-
|
||||
ConditionalExtension(
|
||||
"twisted.internet.iocpreactor.iocpsupport",
|
||||
sources=[
|
||||
@@ -232,7 +227,7 @@ def getSetupArgs(extensions=_EXTENSIONS):
|
||||
requirements.append("hyperlink >= 17.1.1")
|
||||
|
||||
arguments.update(dict(
|
||||
- packages=find_packages("src"),
|
||||
+ packages=find_packages("src", exclude=["*.test", "*.test.*"]),
|
||||
use_incremental=True,
|
||||
setup_requires=["incremental >= 16.10.1"],
|
||||
install_requires=requirements,
|
||||
conditionalExtensions=getExtensions(),
|
||||
entry_points={
|
||||
'console_scripts': getConsoleScripts()
|
||||
@@ -241,6 +236,7 @@ def getSetupArgs(extensions=_EXTENSIONS):
|
||||
},
|
||||
cmdclass=command_classes,
|
||||
include_package_data=True,
|
||||
+ exclude_package_data={'':['test/*']},
|
||||
zip_safe=False,
|
||||
extras_require=_EXTRAS_REQUIRE,
|
||||
))
|
||||
diff --git a/twisted/python/dist.py b/twisted/python/dist.py
|
||||
index dfff9dc..a05b716 100644
|
||||
--- a/twisted/python/dist.py
|
||||
+++ b/twisted/python/dist.py
|
||||
@@ -191,11 +191,11 @@ def getExtensions():
|
||||
Get the C extensions used for Twisted.
|
||||
"""
|
||||
extensions = [
|
||||
- ConditionalExtension(
|
||||
- "twisted.test.raiser",
|
||||
- ["twisted/test/raiser.c"],
|
||||
- condition=lambda _: _isCPython
|
||||
- ),
|
||||
+ #ConditionalExtension(
|
||||
+ # "twisted.test.raiser",
|
||||
+ # ["twisted/test/raiser.c"],
|
||||
+ # condition=lambda _: _isCPython
|
||||
+ #),
|
||||
ConditionalExtension(
|
||||
"twisted.internet.iocpreactor.iocpsupport",
|
||||
["twisted/internet/iocpreactor/iocpsupport/iocpsupport.c",
|
||||
package_dir={"": "src"},
|
||||
|
||||
Reference in New Issue
Block a user