Update to twisted-17.9.0

ok landry@
This commit is contained in:
pvk 2018-04-06 19:14:00 +00:00
parent 3da8a6e465
commit 5b79412ca2
7 changed files with 1097 additions and 950 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.6 2017/05/16 19:27:29 landry Exp $
# $OpenBSD: Makefile,v 1.7 2018/04/06 19:14:00 pvk Exp $
COMMENT = asynchronous networking Python framework
MODPY_EGG_VERSION = 17.1.0
MODPY_EGG_VERSION = 17.9.0
EXTRACT_SUFX = .tar.bz2
DISTNAME = Twisted-${MODPY_EGG_VERSION}
@ -12,7 +12,7 @@ CATEGORIES = devel
HOMEPAGE = http://twistedmatrix.com/
MAINTAINER = Pavel Korovin <p@tristero.se>
MAINTAINER = Pavel Korovin <pvk@openbsd.org>
# MIT
PERMIT_PACKAGE_CDROM = Yes
@ -24,26 +24,41 @@ MODULES = lang/python
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
BUILD_DEPENDS = devel/py-constantly \
devel/py-incremental
BUILD_DEPENDS = devel/py-incremental${MODPY_FLAVOR}
RUN_DEPENDS = devel/py-SOAPpy \
devel/py-asn1 \
devel/py-automat \
devel/py-constantly \
devel/py-incremental \
devel/py-zopeinterface \
net/py-idna \
security/py-cryptography \
security/py-openssl \
security/py-service_identity
RUN_DEPENDS = devel/py-asn1${MODPY_FLAVOR} \
devel/py-automat${MODPY_FLAVOR} \
devel/py-constantly${MODPY_FLAVOR} \
devel/py-incremental${MODPY_FLAVOR} \
devel/py-zopeinterface${MODPY_FLAVOR} \
net/py-idna${MODPY_FLAVOR} \
security/py-cryptography${MODPY_FLAVOR} \
security/py-openssl${MODPY_FLAVOR} \
security/py-service_identity${MODPY_FLAVOR} \
www/py-hyperlink${MODPY_FLAVOR}
FLAVORS = python3
FLAVOR ?=
.if empty(FLAVOR)
RUN_DEPENDS += devel/py-SOAPpy
.endif
SUBST_FILES = ${WRKSRC}/src/Twisted.egg-info/entry_points.txt \
${WRKSRC}/src/twisted/python/_setup.py
TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH}
TEST_ENV = LC_ALL=en_US.UTF-8
TESTDIR = ${WRKSRC}/regress
pre-configure:
${SUBST_CMD} ${SUBST_FILES}
.for f in ${SUBST_FILES}
rm ${WRKSRC}/$f.{orig,beforesubst}
.endfor
do-test:
mkdir -p ${TESTDIR}
cd ${TESTDIR} && ${LOCALBASE}/bin/trial twisted
cd ${TESTDIR} && ${LOCALBASE}/bin/trial${MODPY_BIN_SUFFIX} twisted
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (Twisted-17.1.0.tar.bz2) = 2/IR1wr+W0RC45M/8BhZUz66nxPYs+LhuX3CEl4tRNw=
SIZE (Twisted-17.1.0.tar.bz2) = 2997334
SHA256 (Twisted-17.9.0.tar.bz2) = DaGn411fyuN7yceXiXC1/rO8goIhVbhlTsY5JcBa91w=
SIZE (Twisted-17.9.0.tar.bz2) = 3019243

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-setup_py,v 1.1 2018/04/06 19:14:00 pvk Exp $
Part of https://github.com/twisted/twisted/commit/80e67a6775a190cba77e0d4229d12b9859ba12fc
Index: setup.py
--- setup.py.orig
+++ setup.py
@@ -7,7 +7,6 @@
Setuptools installer for Twisted.
"""
-import os
import sys
import setuptools

View File

@ -0,0 +1,26 @@
$OpenBSD: patch-src_Twisted_egg-info_entry_points_txt,v 1.1 2018/04/06 19:14:00 pvk Exp $
Index: src/Twisted.egg-info/entry_points.txt
--- src/Twisted.egg-info/entry_points.txt.orig
+++ src/Twisted.egg-info/entry_points.txt
@@ -1,11 +1,11 @@
[console_scripts]
-cftp = twisted.conch.scripts.cftp:run
-ckeygen = twisted.conch.scripts.ckeygen:run
-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
+cftp${MODPY_BIN_SUFFIX} = twisted.conch.scripts.cftp:run
+ckeygen${MODPY_BIN_SUFFIX} = twisted.conch.scripts.ckeygen:run
+conch${MODPY_BIN_SUFFIX} = twisted.conch.scripts.conch:run
+mailmail${MODPY_BIN_SUFFIX} = twisted.mail.scripts.mailmail:run
+pyhtmlizer${MODPY_BIN_SUFFIX} = twisted.scripts.htmlizer:run
+tkconch${MODPY_BIN_SUFFIX} = twisted.conch.scripts.tkconch:run
+trial${MODPY_BIN_SUFFIX} = twisted.scripts.trial:run
+twist${MODPY_BIN_SUFFIX} = twisted.application.twist._twist:Twist.main
+twistd${MODPY_BIN_SUFFIX} = twisted.scripts.twistd:run

View File

@ -0,0 +1,43 @@
$OpenBSD: patch-src_twisted_python__setup_py,v 1.1 2018/04/06 19:14:00 pvk Exp $
Add suffix for py3 FLAVOR
Don't install files used to build the extension modules it uses:
https://github.com/twisted/twisted/commit/80e67a6775a190cba77e0d4229d12b9859ba12fc
Index: src/twisted/python/_setup.py
--- src/twisted/python/_setup.py.orig
+++ src/twisted/python/_setup.py
@@ -138,14 +138,14 @@ _EXTRAS_REQUIRE = {
# Scripts provided by Twisted on Python 2 and 3.
_CONSOLE_SCRIPTS = [
- "ckeygen = twisted.conch.scripts.ckeygen:run",
- "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",
+ "ckeygen${MODPY_BIN_SUFFIX} = twisted.conch.scripts.ckeygen:run",
+ "cftp${MODPY_BIN_SUFFIX} = twisted.conch.scripts.cftp:run",
+ "conch${MODPY_BIN_SUFFIX} = twisted.conch.scripts.conch:run",
+ "pyhtmlizer${MODPY_BIN_SUFFIX} = twisted.scripts.htmlizer:run",
+ "tkconch${MODPY_BIN_SUFFIX} = twisted.conch.scripts.tkconch:run",
+ "trial${MODPY_BIN_SUFFIX} = twisted.scripts.trial:run",
+ "twist${MODPY_BIN_SUFFIX} = twisted.application.twist._twist:Twist.main",
+ "twistd${MODPY_BIN_SUFFIX} = twisted.scripts.twistd:run",
]
# Scripts provided by Twisted on Python 2 only.
_CONSOLE_SCRIPTS_PY2 = [
@@ -241,6 +241,9 @@ def getSetupArgs(extensions=_EXTENSIONS):
},
cmdclass=command_classes,
include_package_data=True,
+ exclude_package_data={
+ "": ["*.c", "*.h", "*.pxi", "*.pyx", "build.bat"],
+ },
zip_safe=False,
extras_require=_EXTRAS_REQUIRE,
package_dir={"": "src"},

View File

@ -0,0 +1,96 @@
@comment $OpenBSD
lib/python${MODPY_VERSION}/site-packages/twisted/mail/__init__.py
lib/python${MODPY_VERSION}/site-packages/twisted/mail/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/mail/alias.py
lib/python${MODPY_VERSION}/site-packages/twisted/mail//alias.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/mail/bounce.py
lib/python${MODPY_VERSION}/site-packages/twisted/mail/bounce.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/mail/mail.py
lib/python${MODPY_VERSION}/site-packages/twisted/mail/mail.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/mail/maildir.py
lib/python${MODPY_VERSION}/site-packages/twisted/mail/maildir.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/mail/pb.py
lib/python${MODPY_VERSION}/site-packages/twisted/mail/pb.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/mail/pop3.py
lib/python${MODPY_VERSION}/site-packages/twisted/mail/pop3.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/mail/pop3client.py
lib/python${MODPY_VERSION}/site-packages/twisted/mail/pop3client.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/mail/protocols.py
lib/python${MODPY_VERSION}/site-packages/twisted/mail/protocols.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/mail/relay.py
lib/python${MODPY_VERSION}/site-packages/twisted/mail/relay.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/mail/relaymanager.py
lib/python${MODPY_VERSION}/site-packages/twisted/mail/relaymanager.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/mail/scripts/
lib/python${MODPY_VERSION}/site-packages/twisted/mail/scripts/__init__.py
lib/python${MODPY_VERSION}/site-packages/twisted/mail/scripts/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/mail/scripts/mailmail.py
lib/python${MODPY_VERSION}/site-packages/twisted/mail/scripts/mailmail.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/mail/tap.py
lib/python${MODPY_VERSION}/site-packages/twisted/mail/tap.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/pop3testserver.py
lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/pop3testserver.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_bounce.py
lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_bounce.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_mail.py
lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_mail.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_mailmail.py
lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_mailmail.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_options.py
lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_options.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_pop3.py
lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_pop3.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_pop3client.py
lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_pop3client.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_scripts.py
lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_scripts.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/news/
lib/python${MODPY_VERSION}/site-packages/twisted/news/__init__.py
lib/python${MODPY_VERSION}/site-packages/twisted/news/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/news/database.py
lib/python${MODPY_VERSION}/site-packages/twisted/news/database.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/news/news.py
lib/python${MODPY_VERSION}/site-packages/twisted/news/news.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/news/nntp.py
lib/python${MODPY_VERSION}/site-packages/twisted/news/nntp.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/news/tap.py
lib/python${MODPY_VERSION}/site-packages/twisted/news/tap.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/news/test/
lib/python${MODPY_VERSION}/site-packages/twisted/news/test/__init__.py
lib/python${MODPY_VERSION}/site-packages/twisted/news/test/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/news/test/test_database.py
lib/python${MODPY_VERSION}/site-packages/twisted/news/test/test_database.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/news/test/test_news.py
lib/python${MODPY_VERSION}/site-packages/twisted/news/test/test_news.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/news/test/test_nntp.py
lib/python${MODPY_VERSION}/site-packages/twisted/news/test/test_nntp.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/plugins/twisted_mail.py
lib/python${MODPY_VERSION}/site-packages/twisted/plugins/twisted_mail.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/plugins/twisted_news.py
lib/python${MODPY_VERSION}/site-packages/twisted/plugins/twisted_news.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/protocols/mice/
lib/python${MODPY_VERSION}/site-packages/twisted/protocols/mice/__init__.py
lib/python${MODPY_VERSION}/site-packages/twisted/protocols/mice/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/protocols/mice/mouseman.py
lib/python${MODPY_VERSION}/site-packages/twisted/protocols/mice/mouseman.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/protocols/shoutcast.py
lib/python${MODPY_VERSION}/site-packages/twisted/protocols/shoutcast.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/python/_pydoctor.py
lib/python${MODPY_VERSION}/site-packages/twisted/python/_pydoctor.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/python/_sendmsg.so
lib/python${MODPY_VERSION}/site-packages/twisted/python/finalize.py
lib/python${MODPY_VERSION}/site-packages/twisted/python/finalize.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/python/hook.py
lib/python${MODPY_VERSION}/site-packages/twisted/python/hook.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/python/test/cmodulepullpipe.py
lib/python${MODPY_VERSION}/site-packages/twisted/python/test/cmodulepullpipe.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/python/test/test_pydoctor.py
lib/python${MODPY_VERSION}/site-packages/twisted/python/test/test_pydoctor.pyc
@comment lib/python${MODPY_VERSION}/site-packages/twisted/python/test/test_win32.py
@comment lib/python${MODPY_VERSION}/site-packages/twisted/python/test/test_win32.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/test/test_hook.py
lib/python${MODPY_VERSION}/site-packages/twisted/test/test_hook.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/web/soap.py
lib/python${MODPY_VERSION}/site-packages/twisted/web/soap.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/web/test/test_soap.py
lib/python${MODPY_VERSION}/site-packages/twisted/web/test/test_soap.pyc

File diff suppressed because it is too large Load Diff