[arch-commits] Commit in python-tornado/repos (10 files)
Felix Yan
fyan at archlinux.org
Sat Nov 7 06:36:50 UTC 2015
Date: Saturday, November 7, 2015 @ 07:36:50
Author: fyan
Revision: 146345
archrelease: copy trunk to community-testing-i686, community-testing-x86_64
Added:
python-tornado/repos/community-testing-i686/
python-tornado/repos/community-testing-i686/0001-use_system_ca_certificates.patch
(from rev 146344, python-tornado/trunk/0001-use_system_ca_certificates.patch)
python-tornado/repos/community-testing-i686/0002-get-rid-of-backports-ssl-match-hostname.patch
(from rev 146344, python-tornado/trunk/0002-get-rid-of-backports-ssl-match-hostname.patch)
python-tornado/repos/community-testing-i686/0003-support-monotonic.patch
(from rev 146344, python-tornado/trunk/0003-support-monotonic.patch)
python-tornado/repos/community-testing-i686/PKGBUILD
(from rev 146344, python-tornado/trunk/PKGBUILD)
python-tornado/repos/community-testing-x86_64/
python-tornado/repos/community-testing-x86_64/0001-use_system_ca_certificates.patch
(from rev 146344, python-tornado/trunk/0001-use_system_ca_certificates.patch)
python-tornado/repos/community-testing-x86_64/0002-get-rid-of-backports-ssl-match-hostname.patch
(from rev 146344, python-tornado/trunk/0002-get-rid-of-backports-ssl-match-hostname.patch)
python-tornado/repos/community-testing-x86_64/0003-support-monotonic.patch
(from rev 146344, python-tornado/trunk/0003-support-monotonic.patch)
python-tornado/repos/community-testing-x86_64/PKGBUILD
(from rev 146344, python-tornado/trunk/PKGBUILD)
-----------------------------------------------------------------------------+
community-testing-i686/0001-use_system_ca_certificates.patch | 36 ++++
community-testing-i686/0002-get-rid-of-backports-ssl-match-hostname.patch | 23 ++
community-testing-i686/0003-support-monotonic.patch | 52 +++++
community-testing-i686/PKGBUILD | 90 ++++++++++
community-testing-x86_64/0001-use_system_ca_certificates.patch | 36 ++++
community-testing-x86_64/0002-get-rid-of-backports-ssl-match-hostname.patch | 23 ++
community-testing-x86_64/0003-support-monotonic.patch | 52 +++++
community-testing-x86_64/PKGBUILD | 90 ++++++++++
8 files changed, 402 insertions(+)
Copied: python-tornado/repos/community-testing-i686/0001-use_system_ca_certificates.patch (from rev 146344, python-tornado/trunk/0001-use_system_ca_certificates.patch)
===================================================================
--- community-testing-i686/0001-use_system_ca_certificates.patch (rev 0)
+++ community-testing-i686/0001-use_system_ca_certificates.patch 2015-11-07 06:36:50 UTC (rev 146345)
@@ -0,0 +1,36 @@
+diff --git a/setup.py b/setup.py
+index f09169f..d42c486 100644
+--- a/setup.py
++++ b/setup.py
+@@ -120,7 +120,7 @@ if (platform.python_implementation() == 'CPython' and
+ # Certifi is also optional on 2.7.9+, although making our dependencies
+ # conditional on micro version numbers seems like a bad idea
+ # until we have more declarative metadata.
+- install_requires.append('certifi')
++ pass
+ if sys.version_info < (3, 5):
+ install_requires.append('backports_abc>=0.4')
+ kwargs['install_requires'] = install_requires
+diff --git a/tornado/simple_httpclient.py b/tornado/simple_httpclient.py
+index f0f73fa..ffe3e40 100644
+--- a/tornado/simple_httpclient.py
++++ b/tornado/simple_httpclient.py
+@@ -33,17 +33,9 @@ except ImportError:
+ # ssl is not available on Google App Engine.
+ ssl = None
+
+-try:
+- import certifi
+-except ImportError:
+- certifi = None
+-
+
+ def _default_ca_certs():
+- if certifi is None:
+- raise Exception("The 'certifi' package is required to use https "
+- "in simple_httpclient")
+- return certifi.where()
++ return "/etc/ssl/certs/ca-certificates.crt"
+
+
+ class SimpleAsyncHTTPClient(AsyncHTTPClient):
Copied: python-tornado/repos/community-testing-i686/0002-get-rid-of-backports-ssl-match-hostname.patch (from rev 146344, python-tornado/trunk/0002-get-rid-of-backports-ssl-match-hostname.patch)
===================================================================
--- community-testing-i686/0002-get-rid-of-backports-ssl-match-hostname.patch (rev 0)
+++ community-testing-i686/0002-get-rid-of-backports-ssl-match-hostname.patch 2015-11-07 06:36:50 UTC (rev 146345)
@@ -0,0 +1,23 @@
+From f8f2ffca1928aeca2fa9771093436dba49baa538 Mon Sep 17 00:00:00 2001
+From: Felix Yan <felixonmars at gmail.com>
+Date: Fri, 12 Dec 2014 23:10:15 +0800
+Subject: [PATCH] Don't depend on backports.ssl-match-hostname with python
+ >=2.7.9, <3.0
+
+---
+ setup.py | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index f09169f..f795807 100644
+--- a/setup.py
++++ b/setup.py
+@@ -121,7 +121,7 @@ def build_extension(self, ext):
+ if sys.version_info < (2, 7):
+ # Only needed indirectly, for singledispatch.
+ install_requires.append('ordereddict')
+- if sys.version_info < (3, 2):
++ if sys.version_info < (2, 7, 9) or (3, 0) <= sys.version_info < (3, 2):
+ install_requires.append('backports.ssl_match_hostname')
+ if sys.version_info < (3, 4):
+ install_requires.append('singledispatch')
\ No newline at end of file
Copied: python-tornado/repos/community-testing-i686/0003-support-monotonic.patch (from rev 146344, python-tornado/trunk/0003-support-monotonic.patch)
===================================================================
--- community-testing-i686/0003-support-monotonic.patch (rev 0)
+++ community-testing-i686/0003-support-monotonic.patch 2015-11-07 06:36:50 UTC (rev 146345)
@@ -0,0 +1,52 @@
+commit 7861716d2315606b03c4126505d6b158640218aa
+Author: Felix Yan <felixonmars at archlinux.org>
+Date: Sat Nov 7 13:53:09 2015 +0800
+
+ Add monotonic as an alternative to Monotime
+
+diff --git a/docs/index.rst b/docs/index.rst
+index e4a4d80..14f9af6 100644
+--- a/docs/index.rst
++++ b/docs/index.rst
+@@ -100,6 +100,8 @@ the following optional packages may be useful:
+ * `Monotime <https://pypi.python.org/pypi/Monotime>`_ adds support for
+ a monotonic clock, which improves reliability in environments
+ where clock adjustments are frequent. No longer needed in Python 3.3.
++* `monotonic <https://pypi.python.org/pypi/monotonic>`_ adds support for
++ a monotonic clock. Alternative to Monotime. No longer needed in Python 3.3.
+
+ **Platforms**: Tornado should run on any Unix-like platform, although
+ for the best performance and scalability only Linux (with ``epoll``)
+diff --git a/tornado/platform/auto.py b/tornado/platform/auto.py
+index fc40c9d..449b634 100644
+--- a/tornado/platform/auto.py
++++ b/tornado/platform/auto.py
+@@ -47,8 +47,13 @@ try:
+ except ImportError:
+ pass
+ try:
+- from time import monotonic as monotonic_time
++ # monotonic can provide a monotonic function in versions of python before
++ # 3.3, too.
++ from monotonic import monotonic as monotonic_time
+ except ImportError:
+- monotonic_time = None
++ try:
++ from time import monotonic as monotonic_time
++ except ImportError:
++ monotonic_time = None
+
+ __all__ = ['Waker', 'set_close_exec', 'monotonic_time']
+diff --git a/tox.ini b/tox.ini
+index 82b156d..6f74a74 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -85,7 +85,7 @@ deps =
+ {py2,py27,pypy,py3,py33}-full: singledispatch
+ py33-asyncio: asyncio
+ trollius: trollius
+- py2-monotonic: Monotime
++ py2-monotonic: monotonic
+ sphinx: sphinx
+ sphinx: sphinx_rtd_theme
+
Copied: python-tornado/repos/community-testing-i686/PKGBUILD (from rev 146344, python-tornado/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2015-11-07 06:36:50 UTC (rev 146345)
@@ -0,0 +1,90 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+
+pkgname=('python-tornado' 'python2-tornado')
+pkgver=4.3.0
+pkgrel=1
+pkgdesc='open source version of the scalable, non-blocking web server and tools'
+arch=('i686' 'x86_64')
+url='http://www.tornadoweb.org/'
+license=('Apache')
+makedepends=('python-setuptools' 'python2-setuptools' 'git')
+checkdepends=('python-pycurl' 'python2-pycurl' 'python-mock' 'python2-mock' 'python-twisted'
+ 'python2-twisted' 'python2-futures' 'python2-singledispatch' 'python2-backports-abc'
+ 'python2-trollius' 'python2-monotonic')
+source=("git+https://github.com/tornadoweb/tornado.git#tag=v$pkgver"
+ 0001-use_system_ca_certificates.patch
+ 0002-get-rid-of-backports-ssl-match-hostname.patch
+ 0003-support-monotonic.patch)
+sha512sums=('SKIP'
+ 'cf3dbed20b0bb78cdaa16d4141adc7e12e0b5fd339d2ee9edb5d618dd1c87a643b6ecee19455235b1df712154ce83a1f4149c5579a5a1df5bdf2cd865c766b66'
+ '4a1a3e83214c9243ac7bd7ca141b25a41279ee25ed1400f7b25259329c52c7c625a8b5724d60b83af170643ae7258fd56f42e2d19c85929d77378f70a4d2205a'
+ '4dc30c12a6b454a517ee19ca84f71d1733d41b089399102827c0c9e629b26fec415df9eaf6b43ecbe495cbb5b7b938d5f157c8cb617e9daceff3c15739b7f647')
+
+prepare() {
+ cd tornado
+ patch -p1 -i ../0001-use_system_ca_certificates.patch
+ patch -p1 -i ../0002-get-rid-of-backports-ssl-match-hostname.patch
+ patch -p1 -i ../0003-support-monotonic.patch
+
+ cd "$srcdir"
+ cp -a tornado{,-py2}
+
+ # python -> python2 rename
+ find tornado-py2 -name '*py' -exec sed -e 's_#!/usr/bin/env python_&2_' -i {} \;
+
+ export TORNADO_EXTENSION=1
+}
+
+build() {
+ cd tornado
+ python setup.py build
+
+ cd ../tornado-py2
+ python2 setup.py build
+}
+
+check() {
+ (
+ cd tornado
+ python setup.py install --root="$PWD/tmp_install" --optimize=1
+ export PYTHONPATH="$PWD/tmp_install/usr/lib/python3.5/site-packages:$PYTHONPATH"
+ cd tmp_install
+ python -m tornado.test.runtests
+ python -m tornado.test.runtests --ioloop=tornado.platform.select.SelectIOLoop
+ python -m tornado.test.runtests --httpclient=tornado.curl_httpclient.CurlAsyncHTTPClient
+ python -m tornado.test.runtests --ioloop_time_monotonic
+ python -m tornado.test.runtests --ioloop=tornado.platform.twisted.TwistedIOLoop
+ python -m tornado.test.runtests --ioloop=tornado.platform.asyncio.AsyncIOLoop
+ python -m tornado.test.runtests --resolver=tornado.netutil.ThreadedResolver
+ )
+
+ (
+ cd tornado-py2
+ python2 setup.py install --root="$PWD/tmp_install" --optimize=1
+ export PYTHONPATH="$PWD/tmp_install/usr/lib/python2.7/site-packages:$PYTHONPATH"
+ cd tmp_install
+ python2 -m tornado.test.runtests
+ python2 -m tornado.test.runtests --ioloop=tornado.platform.select.SelectIOLoop
+ python2 -m tornado.test.runtests --httpclient=tornado.curl_httpclient.CurlAsyncHTTPClient
+ python2 -m tornado.test.runtests --ioloop_time_monotonic
+ python2 -m tornado.test.runtests --ioloop=tornado.platform.twisted.TwistedIOLoop
+ python2 -m tornado.test.runtests --ioloop=tornado.platform.asyncio.AsyncIOLoop
+ python2 -m tornado.test.runtests --resolver=tornado.netutil.ThreadedResolver
+ )
+}
+
+package_python-tornado() {
+ depends=('python')
+
+ cd tornado
+ python setup.py install --root="${pkgdir}" --optimize=1
+}
+
+package_python2-tornado() {
+ depends=('python2-singledispatch' 'python2-backports-abc')
+
+ cd tornado-py2
+ python2 setup.py install --root="${pkgdir}" --optimize=1
+}
Copied: python-tornado/repos/community-testing-x86_64/0001-use_system_ca_certificates.patch (from rev 146344, python-tornado/trunk/0001-use_system_ca_certificates.patch)
===================================================================
--- community-testing-x86_64/0001-use_system_ca_certificates.patch (rev 0)
+++ community-testing-x86_64/0001-use_system_ca_certificates.patch 2015-11-07 06:36:50 UTC (rev 146345)
@@ -0,0 +1,36 @@
+diff --git a/setup.py b/setup.py
+index f09169f..d42c486 100644
+--- a/setup.py
++++ b/setup.py
+@@ -120,7 +120,7 @@ if (platform.python_implementation() == 'CPython' and
+ # Certifi is also optional on 2.7.9+, although making our dependencies
+ # conditional on micro version numbers seems like a bad idea
+ # until we have more declarative metadata.
+- install_requires.append('certifi')
++ pass
+ if sys.version_info < (3, 5):
+ install_requires.append('backports_abc>=0.4')
+ kwargs['install_requires'] = install_requires
+diff --git a/tornado/simple_httpclient.py b/tornado/simple_httpclient.py
+index f0f73fa..ffe3e40 100644
+--- a/tornado/simple_httpclient.py
++++ b/tornado/simple_httpclient.py
+@@ -33,17 +33,9 @@ except ImportError:
+ # ssl is not available on Google App Engine.
+ ssl = None
+
+-try:
+- import certifi
+-except ImportError:
+- certifi = None
+-
+
+ def _default_ca_certs():
+- if certifi is None:
+- raise Exception("The 'certifi' package is required to use https "
+- "in simple_httpclient")
+- return certifi.where()
++ return "/etc/ssl/certs/ca-certificates.crt"
+
+
+ class SimpleAsyncHTTPClient(AsyncHTTPClient):
Copied: python-tornado/repos/community-testing-x86_64/0002-get-rid-of-backports-ssl-match-hostname.patch (from rev 146344, python-tornado/trunk/0002-get-rid-of-backports-ssl-match-hostname.patch)
===================================================================
--- community-testing-x86_64/0002-get-rid-of-backports-ssl-match-hostname.patch (rev 0)
+++ community-testing-x86_64/0002-get-rid-of-backports-ssl-match-hostname.patch 2015-11-07 06:36:50 UTC (rev 146345)
@@ -0,0 +1,23 @@
+From f8f2ffca1928aeca2fa9771093436dba49baa538 Mon Sep 17 00:00:00 2001
+From: Felix Yan <felixonmars at gmail.com>
+Date: Fri, 12 Dec 2014 23:10:15 +0800
+Subject: [PATCH] Don't depend on backports.ssl-match-hostname with python
+ >=2.7.9, <3.0
+
+---
+ setup.py | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index f09169f..f795807 100644
+--- a/setup.py
++++ b/setup.py
+@@ -121,7 +121,7 @@ def build_extension(self, ext):
+ if sys.version_info < (2, 7):
+ # Only needed indirectly, for singledispatch.
+ install_requires.append('ordereddict')
+- if sys.version_info < (3, 2):
++ if sys.version_info < (2, 7, 9) or (3, 0) <= sys.version_info < (3, 2):
+ install_requires.append('backports.ssl_match_hostname')
+ if sys.version_info < (3, 4):
+ install_requires.append('singledispatch')
\ No newline at end of file
Copied: python-tornado/repos/community-testing-x86_64/0003-support-monotonic.patch (from rev 146344, python-tornado/trunk/0003-support-monotonic.patch)
===================================================================
--- community-testing-x86_64/0003-support-monotonic.patch (rev 0)
+++ community-testing-x86_64/0003-support-monotonic.patch 2015-11-07 06:36:50 UTC (rev 146345)
@@ -0,0 +1,52 @@
+commit 7861716d2315606b03c4126505d6b158640218aa
+Author: Felix Yan <felixonmars at archlinux.org>
+Date: Sat Nov 7 13:53:09 2015 +0800
+
+ Add monotonic as an alternative to Monotime
+
+diff --git a/docs/index.rst b/docs/index.rst
+index e4a4d80..14f9af6 100644
+--- a/docs/index.rst
++++ b/docs/index.rst
+@@ -100,6 +100,8 @@ the following optional packages may be useful:
+ * `Monotime <https://pypi.python.org/pypi/Monotime>`_ adds support for
+ a monotonic clock, which improves reliability in environments
+ where clock adjustments are frequent. No longer needed in Python 3.3.
++* `monotonic <https://pypi.python.org/pypi/monotonic>`_ adds support for
++ a monotonic clock. Alternative to Monotime. No longer needed in Python 3.3.
+
+ **Platforms**: Tornado should run on any Unix-like platform, although
+ for the best performance and scalability only Linux (with ``epoll``)
+diff --git a/tornado/platform/auto.py b/tornado/platform/auto.py
+index fc40c9d..449b634 100644
+--- a/tornado/platform/auto.py
++++ b/tornado/platform/auto.py
+@@ -47,8 +47,13 @@ try:
+ except ImportError:
+ pass
+ try:
+- from time import monotonic as monotonic_time
++ # monotonic can provide a monotonic function in versions of python before
++ # 3.3, too.
++ from monotonic import monotonic as monotonic_time
+ except ImportError:
+- monotonic_time = None
++ try:
++ from time import monotonic as monotonic_time
++ except ImportError:
++ monotonic_time = None
+
+ __all__ = ['Waker', 'set_close_exec', 'monotonic_time']
+diff --git a/tox.ini b/tox.ini
+index 82b156d..6f74a74 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -85,7 +85,7 @@ deps =
+ {py2,py27,pypy,py3,py33}-full: singledispatch
+ py33-asyncio: asyncio
+ trollius: trollius
+- py2-monotonic: Monotime
++ py2-monotonic: monotonic
+ sphinx: sphinx
+ sphinx: sphinx_rtd_theme
+
Copied: python-tornado/repos/community-testing-x86_64/PKGBUILD (from rev 146344, python-tornado/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2015-11-07 06:36:50 UTC (rev 146345)
@@ -0,0 +1,90 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+
+pkgname=('python-tornado' 'python2-tornado')
+pkgver=4.3.0
+pkgrel=1
+pkgdesc='open source version of the scalable, non-blocking web server and tools'
+arch=('i686' 'x86_64')
+url='http://www.tornadoweb.org/'
+license=('Apache')
+makedepends=('python-setuptools' 'python2-setuptools' 'git')
+checkdepends=('python-pycurl' 'python2-pycurl' 'python-mock' 'python2-mock' 'python-twisted'
+ 'python2-twisted' 'python2-futures' 'python2-singledispatch' 'python2-backports-abc'
+ 'python2-trollius' 'python2-monotonic')
+source=("git+https://github.com/tornadoweb/tornado.git#tag=v$pkgver"
+ 0001-use_system_ca_certificates.patch
+ 0002-get-rid-of-backports-ssl-match-hostname.patch
+ 0003-support-monotonic.patch)
+sha512sums=('SKIP'
+ 'cf3dbed20b0bb78cdaa16d4141adc7e12e0b5fd339d2ee9edb5d618dd1c87a643b6ecee19455235b1df712154ce83a1f4149c5579a5a1df5bdf2cd865c766b66'
+ '4a1a3e83214c9243ac7bd7ca141b25a41279ee25ed1400f7b25259329c52c7c625a8b5724d60b83af170643ae7258fd56f42e2d19c85929d77378f70a4d2205a'
+ '4dc30c12a6b454a517ee19ca84f71d1733d41b089399102827c0c9e629b26fec415df9eaf6b43ecbe495cbb5b7b938d5f157c8cb617e9daceff3c15739b7f647')
+
+prepare() {
+ cd tornado
+ patch -p1 -i ../0001-use_system_ca_certificates.patch
+ patch -p1 -i ../0002-get-rid-of-backports-ssl-match-hostname.patch
+ patch -p1 -i ../0003-support-monotonic.patch
+
+ cd "$srcdir"
+ cp -a tornado{,-py2}
+
+ # python -> python2 rename
+ find tornado-py2 -name '*py' -exec sed -e 's_#!/usr/bin/env python_&2_' -i {} \;
+
+ export TORNADO_EXTENSION=1
+}
+
+build() {
+ cd tornado
+ python setup.py build
+
+ cd ../tornado-py2
+ python2 setup.py build
+}
+
+check() {
+ (
+ cd tornado
+ python setup.py install --root="$PWD/tmp_install" --optimize=1
+ export PYTHONPATH="$PWD/tmp_install/usr/lib/python3.5/site-packages:$PYTHONPATH"
+ cd tmp_install
+ python -m tornado.test.runtests
+ python -m tornado.test.runtests --ioloop=tornado.platform.select.SelectIOLoop
+ python -m tornado.test.runtests --httpclient=tornado.curl_httpclient.CurlAsyncHTTPClient
+ python -m tornado.test.runtests --ioloop_time_monotonic
+ python -m tornado.test.runtests --ioloop=tornado.platform.twisted.TwistedIOLoop
+ python -m tornado.test.runtests --ioloop=tornado.platform.asyncio.AsyncIOLoop
+ python -m tornado.test.runtests --resolver=tornado.netutil.ThreadedResolver
+ )
+
+ (
+ cd tornado-py2
+ python2 setup.py install --root="$PWD/tmp_install" --optimize=1
+ export PYTHONPATH="$PWD/tmp_install/usr/lib/python2.7/site-packages:$PYTHONPATH"
+ cd tmp_install
+ python2 -m tornado.test.runtests
+ python2 -m tornado.test.runtests --ioloop=tornado.platform.select.SelectIOLoop
+ python2 -m tornado.test.runtests --httpclient=tornado.curl_httpclient.CurlAsyncHTTPClient
+ python2 -m tornado.test.runtests --ioloop_time_monotonic
+ python2 -m tornado.test.runtests --ioloop=tornado.platform.twisted.TwistedIOLoop
+ python2 -m tornado.test.runtests --ioloop=tornado.platform.asyncio.AsyncIOLoop
+ python2 -m tornado.test.runtests --resolver=tornado.netutil.ThreadedResolver
+ )
+}
+
+package_python-tornado() {
+ depends=('python')
+
+ cd tornado
+ python setup.py install --root="${pkgdir}" --optimize=1
+}
+
+package_python2-tornado() {
+ depends=('python2-singledispatch' 'python2-backports-abc')
+
+ cd tornado-py2
+ python2 setup.py install --root="${pkgdir}" --optimize=1
+}
More information about the arch-commits
mailing list