diff --git a/srcpkgs/python-tornado/patches/0001-use-system-ca-certificates.patch b/srcpkgs/python-tornado/patches/0001-use-system-ca-certificates.patch index ed04e36828..1c836ad82e 100644 --- a/srcpkgs/python-tornado/patches/0001-use-system-ca-certificates.patch +++ b/srcpkgs/python-tornado/patches/0001-use-system-ca-certificates.patch @@ -1,32 +1,11 @@ --- setup.py.orig +++ setup.py -@@ -120,7 +120,7 @@ if (platform.python_implementation() == 'CPython' and +@@ -136,7 +136,7 @@ if setuptools is not None: # 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 ++ # install_requires.append('certifi') if sys.version_info < (3, 5): install_requires.append('backports_abc>=0.4') - kwargs['install_requires'] = install_requires ---- tornado/simple_httpclient.py.orig -+++ 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): + kwargs['install_requires'] = install_requires diff --git a/srcpkgs/python-tornado/patches/0002-no-backports.ssl_match_hostname.patch b/srcpkgs/python-tornado/patches/0002-no-backports.ssl_match_hostname.patch deleted file mode 100644 index a34fe0b0c5..0000000000 --- a/srcpkgs/python-tornado/patches/0002-no-backports.ssl_match_hostname.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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') diff --git a/srcpkgs/python-tornado/template b/srcpkgs/python-tornado/template index a8feb8a2c2..0147556cd1 100644 --- a/srcpkgs/python-tornado/template +++ b/srcpkgs/python-tornado/template @@ -1,7 +1,7 @@ # Template file for 'python-tornado' pkgname=python-tornado -version=4.3 -revision=2 +version=4.4.1 +revision=1 wrksrc="tornado-${version}" build_style=python-module python_versions="2.7 3.4" @@ -14,7 +14,7 @@ maintainer="Alessio Sergi " homepage="http://www.tornadoweb.org/" license="Apache-2.0" distfiles="${PYPI_SITE}/t/tornado/tornado-${version}.tar.gz" -checksum=c9c2d32593d16eedf2cec1b6a41893626a2649b40b21ca9c4cac4243bde2efbf +checksum=371d0cf3d56c47accc66116a77ad558d76eebaa8458a6b677af71ca606522146 python3.4-tornado_package() { pycompile_version="3.4"