Updates py-tornado to the latest version.
This is needed by ipython2 (diff coming soon). This an ipython2 should be
committed at the same time.
One test is failing. Upon inspection it is actually a test borrowed from
twisted which is failing. This same test fails if you run make test in
devel/py-twisted/core. I am not too phased by this.
Ipython is currently the only port consuming py-tornado, so should be a safe
update.
OK?
Index: Makefile
===================================================================
RCS file: /home/edd/cvsync/cvs/ports/www/py-tornado/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile 11 Mar 2013 11:44:48 -0000 1.7
+++ Makefile 27 Apr 2014 16:53:52 -0000
@@ -2,7 +2,7 @@
COMMENT = scalable, non-blocking web server
-MODPY_EGG_VERSION = 2.4.1
+MODPY_EGG_VERSION = 3.2
DISTNAME = tornado-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
@@ -13,12 +13,23 @@ HOMEPAGE = http://www.tornadoweb.org/
# Apache v2
PERMIT_PACKAGE_CDROM = Yes
-MASTER_SITES = http://cloud.github.com/downloads/facebook/tornado/
+MASTER_SITES = ${MASTER_SITE_PYPI:=t/tornado/}
MODULES = lang/python
+RUN_DEPENDS += devel/py-backports-ssl-match-hostname
+WANTLIB += pthread python2.7
+MODPY_SETUPTOOLS = Yes
+
+pre-configure:
+ ${SUBST_CMD} ${WRKSRC}/runtests.sh
+
+TEST_DEPENDS += devel/py-twisted/names \
+ devel/py-twisted/web \
+ devel/py-mock \
+ net/py-curl \
+ devel/py-futures
do-test:
- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} PYTHONPATH=.\
- ${MODPY_BIN} ./tornado/test/runtests.py
+ @cd ${WRKSRC} && sh runtests.sh
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/edd/cvsync/cvs/ports/www/py-tornado/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 4 Mar 2013 06:13:35 -0000 1.6
+++ distinfo 27 Apr 2014 16:53:52 -0000
@@ -1,2 +1,2 @@
-SHA256 (tornado-2.4.1.tar.gz) = FNOSzxRpjrp1uSmXSPqDcW98AvxJaE38UBFmjDC6awA=
-SIZE (tornado-2.4.1.tar.gz) = 348198
+SHA256 (tornado-3.2.tar.gz) = yMKUnI1Cr3gUN+NWl48ApCsWoJBhJXPNc4XGJFGgDCs=
+SIZE (tornado-3.2.tar.gz) = 400403
Index: patches/patch-runtests_sh
===================================================================
RCS file: patches/patch-runtests_sh
diff -N patches/patch-runtests_sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-runtests_sh 27 Apr 2014 16:53:52 -0000
@@ -0,0 +1,9 @@
+$OpenBSD$
+--- runtests.sh.orig Sun Apr 27 15:31:04 2014
++++ runtests.sh Sun Apr 27 15:31:21 2014
+@@ -15,4 +15,4 @@ cd $(dirname $0)
+ # while "python file.py" uses the directory containing "file.py" (which is
+ # not what you want if file.py appears within a package you want to import
+ # from)
+-python -m tornado.test.runtests "$@"
++${MODPY_BIN} -m tornado.test.runtests "$@"
Index: patches/patch-tornado_test_process_test_py
===================================================================
RCS file: patches/patch-tornado_test_process_test_py
diff -N patches/patch-tornado_test_process_test_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tornado_test_process_test_py 27 Apr 2014 16:53:52 -0000
@@ -0,0 +1,37 @@
+$OpenBSD$
+
+Patch broken subprocess tests.
+
+--- tornado/test/process_test.py.orig Sun Apr 27 15:13:04 2014
++++ tornado/test/process_test.py Sun Apr 27 15:17:06 2014
+@@ -149,7 +149,7 @@ class SubprocessTest(AsyncTestCase):
+ stdin=Subprocess.STREAM,
+ stdout=Subprocess.STREAM,
stderr=subprocess.STDOUT,
+ io_loop=self.io_loop)
+- self.addCleanup(lambda: os.kill(subproc.pid, signal.SIGTERM))
++ #self.addCleanup(lambda: os.kill(subproc.pid, signal.SIGTERM))
+ subproc.stdout.read_until(b'>>> ', self.stop)
+ self.wait()
+ subproc.stdin.write(b"print('hello')\n")
+@@ -159,7 +159,7 @@ class SubprocessTest(AsyncTestCase):
+
+ subproc.stdout.read_until(b">>> ", self.stop)
+ self.wait()
+- subproc.stdin.write(b"raise SystemExit\n")
++ subproc.stdin.write(b"raise SystemExit\n") # subproc dies itself here
+ subproc.stdout.read_until_close(self.stop)
+ data = self.wait()
+ self.assertEqual(data, b"")
+@@ -170,10 +170,10 @@ class SubprocessTest(AsyncTestCase):
+ stdin=Subprocess.STREAM,
+ stdout=Subprocess.STREAM,
stderr=subprocess.STDOUT,
+ io_loop=self.io_loop)
+- self.addCleanup(lambda: os.kill(subproc.pid, signal.SIGTERM))
++ #self.addCleanup(lambda: os.kill(subproc.pid, signal.SIGTERM))
+ subproc.stdout.read_until(b'>>> ', self.stop)
+ self.wait()
+- subproc.stdin.close()
++ subproc.stdin.close() # subproc dies on its own after this line
+ subproc.stdout.read_until_close(self.stop)
+ data = self.wait()
+ self.assertEqual(data, b"\n")
Index: pkg/PLIST
===================================================================
RCS file: /home/edd/cvsync/cvs/ports/www/py-tornado/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 18 Sep 2012 05:28:28 -0000 1.3
+++ pkg/PLIST 27 Apr 2014 16:53:52 -0000
@@ -1,6 +1,11 @@
@comment $OpenBSD: PLIST,v 1.3 2012/09/18 05:28:28 rpointel Exp $
lib/python${MODPY_VERSION}/site-packages/tornado/
-lib/python${MODPY_VERSION}/site-packages/tornado-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/tornado-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/tornado-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/tornado-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/tornado-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/tornado-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/tornado-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/tornado/__init__.py
lib/python${MODPY_VERSION}/site-packages/tornado/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/auth.py
@@ -8,10 +13,10 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/tornado/autoreload.py
lib/python${MODPY_VERSION}/site-packages/tornado/autoreload.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/ca-certificates.crt
+lib/python${MODPY_VERSION}/site-packages/tornado/concurrent.py
+lib/python${MODPY_VERSION}/site-packages/tornado/concurrent.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/curl_httpclient.py
lib/python${MODPY_VERSION}/site-packages/tornado/curl_httpclient.pyc
-lib/python${MODPY_VERSION}/site-packages/tornado/database.py
-lib/python${MODPY_VERSION}/site-packages/tornado/database.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/escape.py
lib/python${MODPY_VERSION}/site-packages/tornado/escape.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/gen.py
@@ -28,6 +33,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/tornado/iostream.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/locale.py
lib/python${MODPY_VERSION}/site-packages/tornado/locale.pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/log.py
+lib/python${MODPY_VERSION}/site-packages/tornado/log.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/netutil.py
lib/python${MODPY_VERSION}/site-packages/tornado/netutil.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/options.py
@@ -35,14 +42,24 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/tornado/platform/
lib/python${MODPY_VERSION}/site-packages/tornado/platform/__init__.py
lib/python${MODPY_VERSION}/site-packages/tornado/platform/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/platform/asyncio.py
+lib/python${MODPY_VERSION}/site-packages/tornado/platform/asyncio.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/platform/auto.py
lib/python${MODPY_VERSION}/site-packages/tornado/platform/auto.pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/platform/caresresolver.py
+lib/python${MODPY_VERSION}/site-packages/tornado/platform/caresresolver.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/platform/common.py
lib/python${MODPY_VERSION}/site-packages/tornado/platform/common.pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/platform/epoll.py
+lib/python${MODPY_VERSION}/site-packages/tornado/platform/epoll.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/platform/interface.py
lib/python${MODPY_VERSION}/site-packages/tornado/platform/interface.pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/platform/kqueue.py
+lib/python${MODPY_VERSION}/site-packages/tornado/platform/kqueue.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/platform/posix.py
lib/python${MODPY_VERSION}/site-packages/tornado/platform/posix.pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/platform/select.py
+lib/python${MODPY_VERSION}/site-packages/tornado/platform/select.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/platform/twisted.py
lib/python${MODPY_VERSION}/site-packages/tornado/platform/twisted.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/platform/windows.py
@@ -51,8 +68,11 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/tornado/process.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/simple_httpclient.py
lib/python${MODPY_VERSION}/site-packages/tornado/simple_httpclient.pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/speedups.so
lib/python${MODPY_VERSION}/site-packages/tornado/stack_context.py
lib/python${MODPY_VERSION}/site-packages/tornado/stack_context.pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/tcpserver.py
+lib/python${MODPY_VERSION}/site-packages/tornado/tcpserver.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/template.py
lib/python${MODPY_VERSION}/site-packages/tornado/template.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/test/
@@ -61,6 +81,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/tornado/test/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/test/auth_test.py
lib/python${MODPY_VERSION}/site-packages/tornado/test/auth_test.pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/test/concurrent_test.py
+lib/python${MODPY_VERSION}/site-packages/tornado/test/concurrent_test.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/test/csv_translations/
lib/python${MODPY_VERSION}/site-packages/tornado/test/csv_translations/fr_FR.csv
lib/python${MODPY_VERSION}/site-packages/tornado/test/curl_httpclient_test.py
@@ -88,10 +110,17 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/tornado/test/iostream_test.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/test/locale_test.py
lib/python${MODPY_VERSION}/site-packages/tornado/test/locale_test.pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/test/log_test.py
+lib/python${MODPY_VERSION}/site-packages/tornado/test/log_test.pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/test/netutil_test.py
+lib/python${MODPY_VERSION}/site-packages/tornado/test/netutil_test.pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/test/options_test.cfg
lib/python${MODPY_VERSION}/site-packages/tornado/test/options_test.py
lib/python${MODPY_VERSION}/site-packages/tornado/test/options_test.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/test/process_test.py
lib/python${MODPY_VERSION}/site-packages/tornado/test/process_test.pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/test/resolve_test_helper.py
+lib/python${MODPY_VERSION}/site-packages/tornado/test/resolve_test_helper.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/test/runtests.py
lib/python${MODPY_VERSION}/site-packages/tornado/test/runtests.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/test/simple_httpclient_test.py
@@ -99,6 +128,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/tornado/test/stack_context_test.py
lib/python${MODPY_VERSION}/site-packages/tornado/test/stack_context_test.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/test/static/
+lib/python${MODPY_VERSION}/site-packages/tornado/test/static/dir/
+lib/python${MODPY_VERSION}/site-packages/tornado/test/static/dir/index.html
lib/python${MODPY_VERSION}/site-packages/tornado/test/static/robots.txt
lib/python${MODPY_VERSION}/site-packages/tornado/test/template_test.py
lib/python${MODPY_VERSION}/site-packages/tornado/test/template_test.pyc
@@ -110,10 +141,14 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/tornado/test/testing_test.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/test/twisted_test.py
lib/python${MODPY_VERSION}/site-packages/tornado/test/twisted_test.pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/test/util.py
+lib/python${MODPY_VERSION}/site-packages/tornado/test/util.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/test/util_test.py
lib/python${MODPY_VERSION}/site-packages/tornado/test/util_test.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/test/web_test.py
lib/python${MODPY_VERSION}/site-packages/tornado/test/web_test.pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/test/websocket_test.py
+lib/python${MODPY_VERSION}/site-packages/tornado/test/websocket_test.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/test/wsgi_test.py
lib/python${MODPY_VERSION}/site-packages/tornado/test/wsgi_test.pyc
lib/python${MODPY_VERSION}/site-packages/tornado/testing.py
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
