[arch-commits] Commit in python-tornado/repos (6 files)
Felix Yan
fyan at archlinux.org
Thu Sep 11 07:08:59 UTC 2014
Date: Thursday, September 11, 2014 @ 09:08:59
Author: fyan
Revision: 118808
archrelease: copy trunk to community-i686, community-x86_64
Added:
python-tornado/repos/community-i686/PKGBUILD
(from rev 118807, python-tornado/trunk/PKGBUILD)
python-tornado/repos/community-i686/use_system_ca_certificates.patch
(from rev 118807, python-tornado/trunk/use_system_ca_certificates.patch)
python-tornado/repos/community-x86_64/PKGBUILD
(from rev 118807, python-tornado/trunk/PKGBUILD)
python-tornado/repos/community-x86_64/use_system_ca_certificates.patch
(from rev 118807, python-tornado/trunk/use_system_ca_certificates.patch)
Deleted:
python-tornado/repos/community-i686/PKGBUILD
python-tornado/repos/community-x86_64/PKGBUILD
---------------------------------------------------+
/PKGBUILD | 124 ++++++++++++++++++++
community-i686/PKGBUILD | 58 ---------
community-i686/use_system_ca_certificates.patch | 57 +++++++++
community-x86_64/PKGBUILD | 58 ---------
community-x86_64/use_system_ca_certificates.patch | 57 +++++++++
5 files changed, 238 insertions(+), 116 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-09-11 07:08:27 UTC (rev 118807)
+++ community-i686/PKGBUILD 2014-09-11 07:08:59 UTC (rev 118808)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at gmail.com>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-
-pkgname=('python-tornado' 'python2-tornado')
-pkgver=4.0.1
-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' 'python2-backports.ssl_match_hostname' 'git' 'python-certifi' 'python2-certifi')
-checkdepends=('python-pycurl' 'python2-pycurl' 'python-mock' 'python2-mock' 'python-twisted' 'python2-twisted')
-source=("git+https://github.com/facebook/tornado.git#tag=v$pkgver")
-sha512sums=('SKIP')
-
-prepare() {
- cp -a tornado{,-py2}
-
- # python -> python2 rename
- find tornado-py2 -name '*py' -exec sed -e 's_#!/usr/bin/env python_&2_' -i {} \;
-}
-
-build() {
- cd tornado
- python setup.py build
-
- cd ../tornado-py2
- python2 setup.py build
-}
-
-check() {
- cd tornado
- python -m tornado.test.runtests || warning "Tests failed"
- python -m tornado.test.runtests --ioloop=tornado.platform.asyncio.AsyncIOLoop || warning "Tests with AsyncIO failed"
- python -m tornado.test.runtests --ioloop=tornado.platform.select.SelectIOLoop || warning "Tests with SelectIO failed"
- python -m tornado.test.runtests --ioloop=tornado.platform.twisted.TwistedIOLoop || warning "Tests with TwistedIO failed"
-
- cd ../tornado-py2
- python2 -m tornado.test.runtests || warning "Tests failed"
- python2 -m tornado.test.runtests --ioloop=tornado.platform.twisted.TwistedIOLoop || warning "Tests with TwistedIO failed"
- python2 -m tornado.test.runtests --ioloop=tornado.platform.select.SelectIOLoop || warning "Tests with SelectIO failed"
-}
-
-package_python-tornado() {
- depends=('python-certifi')
-
- cd tornado
- python setup.py install --root="${pkgdir}" --optimize=1
-}
-
-package_python2-tornado() {
- depends=('python2-certifi' 'python2-backports.ssl_match_hostname')
-
- cd tornado-py2
- python2 setup.py install --root="${pkgdir}" --optimize=1
-}
-
Copied: python-tornado/repos/community-i686/PKGBUILD (from rev 118807, python-tornado/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-09-11 07:08:59 UTC (rev 118808)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at gmail.com>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+
+pkgname=('python-tornado' 'python2-tornado')
+pkgver=4.0.2
+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' 'python2-backports.ssl_match_hostname' 'git')
+checkdepends=('python-pycurl' 'python2-pycurl' 'python-mock' 'python2-mock' 'python-twisted' 'python2-twisted')
+source=("git+https://github.com/facebook/tornado.git#tag=v$pkgver"
+ use_system_ca_certificates.patch)
+sha512sums=('SKIP'
+ '6e50e9ecf361d54d9f67e1f12185cf58863ad0eae72fbe7cc24e8eaf94874255009a030249bb51adf06e98c7ed0b17d8c6d9ee65190ebc341d6857c0efbc7840')
+
+prepare() {
+ cd tornado
+ patch -p1 -i ../use_system_ca_certificates.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 {} \;
+}
+
+build() {
+ cd tornado
+ python setup.py build
+
+ cd ../tornado-py2
+ python2 setup.py build
+}
+
+check() {
+ cd tornado
+ python -m tornado.test.runtests || warning "Tests failed"
+ python -m tornado.test.runtests --ioloop=tornado.platform.asyncio.AsyncIOLoop || warning "Tests with AsyncIO failed"
+ python -m tornado.test.runtests --ioloop=tornado.platform.select.SelectIOLoop || warning "Tests with SelectIO failed"
+ python -m tornado.test.runtests --ioloop=tornado.platform.twisted.TwistedIOLoop || warning "Tests with TwistedIO failed"
+
+ cd ../tornado-py2
+ python2 -m tornado.test.runtests || warning "Tests failed"
+ python2 -m tornado.test.runtests --ioloop=tornado.platform.twisted.TwistedIOLoop || warning "Tests with TwistedIO failed"
+ python2 -m tornado.test.runtests --ioloop=tornado.platform.select.SelectIOLoop || warning "Tests with SelectIO failed"
+}
+
+package_python-tornado() {
+ cd tornado
+ python setup.py install --root="${pkgdir}" --optimize=1
+}
+
+package_python2-tornado() {
+ depends=('python2-backports.ssl_match_hostname')
+
+ cd tornado-py2
+ python2 setup.py install --root="${pkgdir}" --optimize=1
+}
+
Copied: python-tornado/repos/community-i686/use_system_ca_certificates.patch (from rev 118807, python-tornado/trunk/use_system_ca_certificates.patch)
===================================================================
--- community-i686/use_system_ca_certificates.patch (rev 0)
+++ community-i686/use_system_ca_certificates.patch 2014-09-11 07:08:59 UTC (rev 118808)
@@ -0,0 +1,57 @@
+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
+
+ if setuptools is not None:
+ # If setuptools is not available, you're on your own for dependencies.
+- install_requires = ['certifi']
++ install_requires = []
+ if sys.version_info < (3, 2):
+ install_requires.append('backports.ssl_match_hostname')
+ 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):
+diff --git a/tornado/test/iostream_test.py b/tornado/test/iostream_test.py
+index 01b0d95..47a64e7 100644
+--- a/tornado/test/iostream_test.py
++++ b/tornado/test/iostream_test.py
+@@ -10,7 +10,6 @@ from tornado.stack_context import NullContext
+ from tornado.testing import AsyncHTTPTestCase, AsyncHTTPSTestCase, AsyncTestCase, bind_unused_port, ExpectLog, gen_test
+ from tornado.test.util import unittest, skipIfNonUnix
+ from tornado.web import RequestHandler, Application
+-import certifi
+ import errno
+ import logging
+ import os
+@@ -855,7 +854,7 @@ class TestIOStreamStartTLS(AsyncTestCase):
+ def test_handshake_fail(self):
+ self.server_start_tls(_server_ssl_options())
+ client_future = self.client_start_tls(
+- dict(cert_reqs=ssl.CERT_REQUIRED, ca_certs=certifi.where()))
++ dict(cert_reqs=ssl.CERT_REQUIRED, ca_certs="/etc/ssl/certs/ca-certificates.crt"))
+ with ExpectLog(gen_log, "SSL Error"):
+ with self.assertRaises(ssl.SSLError):
+ yield client_future
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-09-11 07:08:27 UTC (rev 118807)
+++ community-x86_64/PKGBUILD 2014-09-11 07:08:59 UTC (rev 118808)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at gmail.com>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-
-pkgname=('python-tornado' 'python2-tornado')
-pkgver=4.0.1
-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' 'python2-backports.ssl_match_hostname' 'git' 'python-certifi' 'python2-certifi')
-checkdepends=('python-pycurl' 'python2-pycurl' 'python-mock' 'python2-mock' 'python-twisted' 'python2-twisted')
-source=("git+https://github.com/facebook/tornado.git#tag=v$pkgver")
-sha512sums=('SKIP')
-
-prepare() {
- cp -a tornado{,-py2}
-
- # python -> python2 rename
- find tornado-py2 -name '*py' -exec sed -e 's_#!/usr/bin/env python_&2_' -i {} \;
-}
-
-build() {
- cd tornado
- python setup.py build
-
- cd ../tornado-py2
- python2 setup.py build
-}
-
-check() {
- cd tornado
- python -m tornado.test.runtests || warning "Tests failed"
- python -m tornado.test.runtests --ioloop=tornado.platform.asyncio.AsyncIOLoop || warning "Tests with AsyncIO failed"
- python -m tornado.test.runtests --ioloop=tornado.platform.select.SelectIOLoop || warning "Tests with SelectIO failed"
- python -m tornado.test.runtests --ioloop=tornado.platform.twisted.TwistedIOLoop || warning "Tests with TwistedIO failed"
-
- cd ../tornado-py2
- python2 -m tornado.test.runtests || warning "Tests failed"
- python2 -m tornado.test.runtests --ioloop=tornado.platform.twisted.TwistedIOLoop || warning "Tests with TwistedIO failed"
- python2 -m tornado.test.runtests --ioloop=tornado.platform.select.SelectIOLoop || warning "Tests with SelectIO failed"
-}
-
-package_python-tornado() {
- depends=('python-certifi')
-
- cd tornado
- python setup.py install --root="${pkgdir}" --optimize=1
-}
-
-package_python2-tornado() {
- depends=('python2-certifi' 'python2-backports.ssl_match_hostname')
-
- cd tornado-py2
- python2 setup.py install --root="${pkgdir}" --optimize=1
-}
-
Copied: python-tornado/repos/community-x86_64/PKGBUILD (from rev 118807, python-tornado/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-09-11 07:08:59 UTC (rev 118808)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at gmail.com>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+
+pkgname=('python-tornado' 'python2-tornado')
+pkgver=4.0.2
+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' 'python2-backports.ssl_match_hostname' 'git')
+checkdepends=('python-pycurl' 'python2-pycurl' 'python-mock' 'python2-mock' 'python-twisted' 'python2-twisted')
+source=("git+https://github.com/facebook/tornado.git#tag=v$pkgver"
+ use_system_ca_certificates.patch)
+sha512sums=('SKIP'
+ '6e50e9ecf361d54d9f67e1f12185cf58863ad0eae72fbe7cc24e8eaf94874255009a030249bb51adf06e98c7ed0b17d8c6d9ee65190ebc341d6857c0efbc7840')
+
+prepare() {
+ cd tornado
+ patch -p1 -i ../use_system_ca_certificates.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 {} \;
+}
+
+build() {
+ cd tornado
+ python setup.py build
+
+ cd ../tornado-py2
+ python2 setup.py build
+}
+
+check() {
+ cd tornado
+ python -m tornado.test.runtests || warning "Tests failed"
+ python -m tornado.test.runtests --ioloop=tornado.platform.asyncio.AsyncIOLoop || warning "Tests with AsyncIO failed"
+ python -m tornado.test.runtests --ioloop=tornado.platform.select.SelectIOLoop || warning "Tests with SelectIO failed"
+ python -m tornado.test.runtests --ioloop=tornado.platform.twisted.TwistedIOLoop || warning "Tests with TwistedIO failed"
+
+ cd ../tornado-py2
+ python2 -m tornado.test.runtests || warning "Tests failed"
+ python2 -m tornado.test.runtests --ioloop=tornado.platform.twisted.TwistedIOLoop || warning "Tests with TwistedIO failed"
+ python2 -m tornado.test.runtests --ioloop=tornado.platform.select.SelectIOLoop || warning "Tests with SelectIO failed"
+}
+
+package_python-tornado() {
+ cd tornado
+ python setup.py install --root="${pkgdir}" --optimize=1
+}
+
+package_python2-tornado() {
+ depends=('python2-backports.ssl_match_hostname')
+
+ cd tornado-py2
+ python2 setup.py install --root="${pkgdir}" --optimize=1
+}
+
Copied: python-tornado/repos/community-x86_64/use_system_ca_certificates.patch (from rev 118807, python-tornado/trunk/use_system_ca_certificates.patch)
===================================================================
--- community-x86_64/use_system_ca_certificates.patch (rev 0)
+++ community-x86_64/use_system_ca_certificates.patch 2014-09-11 07:08:59 UTC (rev 118808)
@@ -0,0 +1,57 @@
+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
+
+ if setuptools is not None:
+ # If setuptools is not available, you're on your own for dependencies.
+- install_requires = ['certifi']
++ install_requires = []
+ if sys.version_info < (3, 2):
+ install_requires.append('backports.ssl_match_hostname')
+ 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):
+diff --git a/tornado/test/iostream_test.py b/tornado/test/iostream_test.py
+index 01b0d95..47a64e7 100644
+--- a/tornado/test/iostream_test.py
++++ b/tornado/test/iostream_test.py
+@@ -10,7 +10,6 @@ from tornado.stack_context import NullContext
+ from tornado.testing import AsyncHTTPTestCase, AsyncHTTPSTestCase, AsyncTestCase, bind_unused_port, ExpectLog, gen_test
+ from tornado.test.util import unittest, skipIfNonUnix
+ from tornado.web import RequestHandler, Application
+-import certifi
+ import errno
+ import logging
+ import os
+@@ -855,7 +854,7 @@ class TestIOStreamStartTLS(AsyncTestCase):
+ def test_handshake_fail(self):
+ self.server_start_tls(_server_ssl_options())
+ client_future = self.client_start_tls(
+- dict(cert_reqs=ssl.CERT_REQUIRED, ca_certs=certifi.where()))
++ dict(cert_reqs=ssl.CERT_REQUIRED, ca_certs="/etc/ssl/certs/ca-certificates.crt"))
+ with ExpectLog(gen_log, "SSL Error"):
+ with self.assertRaises(ssl.SSLError):
+ yield client_future
More information about the arch-commits
mailing list