python-tornado: update to 4.3
This commit is contained in:
parent
090a8e77e1
commit
435a4e3aa5
|
@ -1,6 +1,4 @@
|
||||||
diff --git setup.py setup.py
|
--- setup.py.orig
|
||||||
index f09169f..d42c486 100644
|
|
||||||
--- setup.py
|
|
||||||
+++ setup.py
|
+++ setup.py
|
||||||
@@ -120,7 +120,7 @@ if (platform.python_implementation() == 'CPython' and
|
@@ -120,7 +120,7 @@ if (platform.python_implementation() == 'CPython' and
|
||||||
# Certifi is also optional on 2.7.9+, although making our dependencies
|
# Certifi is also optional on 2.7.9+, although making our dependencies
|
||||||
|
@ -8,29 +6,27 @@ index f09169f..d42c486 100644
|
||||||
# until we have more declarative metadata.
|
# until we have more declarative metadata.
|
||||||
- install_requires.append('certifi')
|
- install_requires.append('certifi')
|
||||||
+ pass
|
+ pass
|
||||||
kwargs['install_requires'] = install_requires
|
if sys.version_info < (3, 5):
|
||||||
|
install_requires.append('backports_abc>=0.4')
|
||||||
setup(
|
kwargs['install_requires'] = install_requires
|
||||||
diff --git tornado/simple_httpclient.py tornado/simple_httpclient.py
|
--- tornado/simple_httpclient.py.orig
|
||||||
index f0f73fa..ffe3e40 100644
|
|
||||||
--- tornado/simple_httpclient.py
|
|
||||||
+++ tornado/simple_httpclient.py
|
+++ tornado/simple_httpclient.py
|
||||||
@@ -33,17 +33,9 @@ except ImportError:
|
@@ -33,17 +33,9 @@ except ImportError:
|
||||||
# ssl is not available on Google App Engine.
|
# ssl is not available on Google App Engine.
|
||||||
ssl = None
|
ssl = None
|
||||||
|
|
||||||
-try:
|
-try:
|
||||||
- import certifi
|
- import certifi
|
||||||
-except ImportError:
|
-except ImportError:
|
||||||
- certifi = None
|
- certifi = None
|
||||||
-
|
-
|
||||||
|
|
||||||
def _default_ca_certs():
|
def _default_ca_certs():
|
||||||
- if certifi is None:
|
- if certifi is None:
|
||||||
- raise Exception("The 'certifi' package is required to use https "
|
- raise Exception("The 'certifi' package is required to use https "
|
||||||
- "in simple_httpclient")
|
- "in simple_httpclient")
|
||||||
- return certifi.where()
|
- return certifi.where()
|
||||||
+ return "/etc/ssl/certs/ca-certificates.crt"
|
+ return "/etc/ssl/certs/ca-certificates.crt"
|
||||||
|
|
||||||
|
|
||||||
class SimpleAsyncHTTPClient(AsyncHTTPClient):
|
class SimpleAsyncHTTPClient(AsyncHTTPClient):
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- setup.py.orig
|
||||||
|
+++ 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')
|
|
@ -1,14 +0,0 @@
|
||||||
diff --git setup.py setup.py
|
|
||||||
index f09169f..f795807 100644
|
|
||||||
--- setup.py
|
|
||||||
+++ setup.py
|
|
||||||
@@ -121,7 +121,7 @@ def build_extension(self, ext):
|
|
||||||
if setuptools is not None:
|
|
||||||
# If setuptools is not available, you're on your own for dependencies.
|
|
||||||
install_requires = []
|
|
||||||
- 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')
|
|
||||||
kwargs['install_requires'] = install_requires
|
|
||||||
|
|
||||||
|
|
|
@ -1,31 +1,25 @@
|
||||||
# Template file for 'python-tornado'
|
# Template file for 'python-tornado'
|
||||||
pkgname=python-tornado
|
pkgname=python-tornado
|
||||||
reverts=4.3_1
|
version=4.3
|
||||||
version=4.2.1
|
revision=1
|
||||||
revision=2
|
|
||||||
wrksrc="tornado-${version}"
|
wrksrc="tornado-${version}"
|
||||||
build_style=python-module
|
build_style=python-module
|
||||||
python_versions="2.7 3.4"
|
python_versions="2.7 3.4"
|
||||||
|
pycompile_module="tornado"
|
||||||
hostmakedepends="python-setuptools python3.4-setuptools"
|
hostmakedepends="python-setuptools python3.4-setuptools"
|
||||||
makedepends="python-devel python3.4-devel"
|
makedepends="python-devel python3.4-devel"
|
||||||
depends="ca-certificates"
|
depends="ca-certificates python-singledispatch python-backports_abc"
|
||||||
pycompile_module="tornado"
|
|
||||||
short_desc="Python2 web framework and asynchronous networking library"
|
short_desc="Python2 web framework and asynchronous networking library"
|
||||||
maintainer="Alessio Sergi <al3hex@gmail.com>"
|
maintainer="Alessio Sergi <al3hex@gmail.com>"
|
||||||
homepage="http://www.tornadoweb.org/"
|
homepage="http://www.tornadoweb.org/"
|
||||||
license="Apache-2.0"
|
license="Apache-2.0"
|
||||||
distfiles="${PYPI_SITE}/t/tornado/tornado-${version}.tar.gz"
|
distfiles="${PYPI_SITE}/t/tornado/tornado-${version}.tar.gz"
|
||||||
checksum=a16fcdc4f76b184cb82f4f9eaeeacef6113b524b26a2cb331222e4a7fa6f2969
|
checksum=c9c2d32593d16eedf2cec1b6a41893626a2649b40b21ca9c4cac4243bde2efbf
|
||||||
|
|
||||||
pre_build() {
|
|
||||||
# remove shebang
|
|
||||||
sed -i '/^#!\//,1d' tornado/*.py tornado/*/*.py
|
|
||||||
}
|
|
||||||
|
|
||||||
python3.4-tornado_package() {
|
python3.4-tornado_package() {
|
||||||
depends="ca-certificates"
|
|
||||||
pycompile_version="3.4"
|
pycompile_version="3.4"
|
||||||
pycompile_module="tornado"
|
pycompile_module="tornado"
|
||||||
|
depends="ca-certificates python3.4-backports_abc"
|
||||||
short_desc="${short_desc/Python2/Python3.4}"
|
short_desc="${short_desc/Python2/Python3.4}"
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
vmove usr/lib/python3.4
|
vmove usr/lib/python3.4
|
||||||
|
|
Loading…
Reference in New Issue