Date: Tuesday, September 22, 2020 @ 04:18:49 Author: eschwartz Revision: 711336
upgpkg: python-httpx 0.14.0-1: upstream release - hstspreload got dropped upstream as a bad idea for a server library - h2 is needed for testing httpcore's http2 support which is now optional - rebase patch Modified: python-httpx/trunk/0001-Do-not-override-the-system-SSL-certificates-with-the.patch python-httpx/trunk/PKGBUILD -----------------------------------------------------------------+ 0001-Do-not-override-the-system-SSL-certificates-with-the.patch | 32 +++++----- PKGBUILD | 16 ++--- 2 files changed, 24 insertions(+), 24 deletions(-) Modified: 0001-Do-not-override-the-system-SSL-certificates-with-the.patch =================================================================== --- 0001-Do-not-override-the-system-SSL-certificates-with-the.patch 2020-09-22 04:13:36 UTC (rev 711335) +++ 0001-Do-not-override-the-system-SSL-certificates-with-the.patch 2020-09-22 04:18:49 UTC (rev 711336) @@ -1,4 +1,4 @@ -From b3d83c15c366747bf84772311eecad29e1413cb5 Mon Sep 17 00:00:00 2001 +From d03e57b75c2eb8a3696b6dd9a5f84aba4f01280c Mon Sep 17 00:00:00 2001 From: Eli Schwartz <eschwa...@archlinux.org> Date: Mon, 13 Jul 2020 11:29:54 -0400 Subject: [PATCH] Do not override the system SSL certificates with the certifi @@ -19,10 +19,10 @@ 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/httpx/_config.py b/httpx/_config.py -index 3785af9..d6aecf3 100644 +index 8d589ea..ea256a8 100644 --- a/httpx/_config.py +++ b/httpx/_config.py -@@ -4,8 +4,6 @@ import typing +@@ -5,8 +5,6 @@ import warnings from base64 import b64encode from pathlib import Path @@ -31,7 +31,7 @@ from ._models import URL, Headers from ._types import CertTypes, HeaderTypes, TimeoutTypes, URLTypes, VerifyTypes from ._utils import get_ca_bundle_from_env, get_logger, warn_deprecated -@@ -45,7 +43,7 @@ class SSLConfig: +@@ -57,7 +55,7 @@ class SSLConfig: SSL Configuration. """ @@ -41,7 +41,7 @@ def __init__( self, diff --git a/setup.py b/setup.py -index cc62169..e6fe71a 100644 +index e811d2a..2eaf419 100644 --- a/setup.py +++ b/setup.py @@ -55,7 +55,6 @@ setup( @@ -49,14 +49,14 @@ zip_safe=False, install_requires=[ - "certifi", - "hstspreload", "sniffio", "chardet==3.*", + "rfc3986[idna2008]>=1.3,<2", diff --git a/tests/test_config.py b/tests/test_config.py -index 41d8191..286da00 100644 +index 5c68bad..a03c607 100644 --- a/tests/test_config.py +++ b/tests/test_config.py -@@ -4,7 +4,6 @@ import ssl +@@ -3,7 +3,6 @@ import ssl import sys from pathlib import Path @@ -64,24 +64,24 @@ import pytest import httpx -@@ -24,7 +23,7 @@ def test_load_ssl_config_verify_non_existing_path(): +@@ -21,7 +20,7 @@ def test_load_ssl_config_verify_non_existing_path(): def test_load_ssl_config_verify_existing_file(): -- ssl_config = SSLConfig(verify=certifi.where()) -+ ssl_config = SSLConfig(verify="/etc/ssl/certs/ca-certificates.crt") - context = ssl_config.ssl_context +- context = httpx.create_ssl_context(verify=certifi.where()) ++ context = httpx.create_ssl_context(verify="/etc/ssl/certs/ca-certificates.crt") assert context.verify_mode == ssl.VerifyMode.CERT_REQUIRED assert context.check_hostname is True -@@ -55,7 +54,7 @@ def test_load_ssl_config_verify_env_file(https_server, ca_cert_pem_file, config) +@@ -44,7 +43,7 @@ def test_load_ssl_config_verify_env_file( + def test_load_ssl_config_verify_directory(): - path = Path(certifi.where()).parent + path = Path("/etc/ssl/certs/ca-certificates.crt").parent - ssl_config = SSLConfig(verify=path) - context = ssl_config.ssl_context + context = httpx.create_ssl_context(verify=str(path)) assert context.verify_mode == ssl.VerifyMode.CERT_REQUIRED + assert context.check_hostname is True -- -2.27.0 +2.28.0 Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-09-22 04:13:36 UTC (rev 711335) +++ PKGBUILD 2020-09-22 04:18:49 UTC (rev 711336) @@ -2,22 +2,22 @@ _pkgname=httpx pkgname=python-httpx -pkgver=0.13.3 -pkgrel=5 +pkgver=0.14.0 +pkgrel=1 pkgdesc="A next generation HTTP client for Python" arch=('any') url="https://github.com/encode/${_pkgname}" license=('BSD') -depends=('python-chardet' 'python-hstspreload' 'python-httpcore' 'python-idna' 'python-rfc3986' 'python-sniffio') +depends=('python-chardet' 'python-httpcore' 'python-idna' 'python-rfc3986' 'python-sniffio') optdepends=('python-brotli: for brotli response decompression') makedepends=('python-setuptools') -checkdepends=('python-pytest-asyncio' 'python-pytest-trio' 'python-brotli' 'python-trustme' 'uvicorn') +checkdepends=('python-pytest-asyncio' 'python-pytest-trio' 'python-brotli' 'python-h2' 'python-trustme' 'uvicorn') source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz" "0001-Do-not-override-the-system-SSL-certificates-with-the.patch") -sha512sums=('54cdee16e8253c221c3298817ccf63a4a0d6755a86feea2aa5a2efe9af44eb1eb0a578b21f593fe28fceace17b0a0badb52a66965c35bf456ea57dd3b905ebbe' - '9affdf1c41fc9660b0374d2adae8115aa01e31fa13d396a682593ff24248bf4b70fa1266d01a95281fab760265292c0d97f329f71b00e723ad71ae809c4e6235') -b2sums=('d3a56c2386841909668e34eaa78d202f91ad900230b9d1d4254bfa08312312d020e081aea2839dbb57d85fa26ccfc3f093404801c4dd5c47051f3c9fd2746552' - 'b96027d611901e65f90969f796c244acb8605243e2fd23eb2ea946b895464e6e89a39c9886de479f8561a4d55154e2a80dc21f6f29c201a36f7ca429c6962f9f') +sha512sums=('1a49a2f112a324e6a4b4cd76a6c13bf53ab96332356c8fafa71bd37a4e6bc5f888df0c85937ac0287d7cd21f3eadb18b18155e8911550cfe48946b283309c22c' + 'e4b1e33a77cdb5555a4ac3d09b59bc4a0a176a7f5d97099d66a4876abcfd3889058e21beb8bfc375e8e7e61b3808d2a76119033e1a44602d8e6cd461ea3f88de') +b2sums=('93cc96ba3862f4119bcd67dde7539aee6ecffe504f533b38ad698fe9159b18b5333719b25df739d5b3073d7e423e9798016f08b677869d4816357c986657f126' + 'e03d340cef44bfb322219030bbcbe53c1323c8b9d9d7aace07045e80faa185a7594839c9ff0fee9604a7fddf916db462f95a341d51f17072bce8e55d53055c7b') prepare() { cd "${srcdir}"/${_pkgname}-${pkgver}