From ebd37eabeb1c77e2f7e9aa64387ba5ff94656caf Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 12 Jan 2026 07:12:18 +0000 Subject: [PATCH] dev-python/urllib3: Sync with Gentoo It's from Gentoo commit 0aa47e7048183bfd1d51867950f9ace8e0a2e0d6. Signed-off-by: Flatcar Buildbot --- .../dev-python/urllib3/Manifest | 3 ++- ...lib3-2.5.0.ebuild => urllib3-2.6.3.ebuild} | 22 +++++++++++++------ 2 files changed, 17 insertions(+), 8 deletions(-) rename sdk_container/src/third_party/portage-stable/dev-python/urllib3/{urllib3-2.5.0.ebuild => urllib3-2.6.3.ebuild} (83%) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/urllib3/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/urllib3/Manifest index c4a31cd9b8..2c4a465013 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/urllib3/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/urllib3/Manifest @@ -1,2 +1,3 @@ DIST hypercorn-d1719f8c1570cbd8e6a3719ffdb14a4d72880abb.gh.tar.gz 156216 BLAKE2B fcb5f49653401e6e4079e1c770d3cd407602d4d6764437b735bd4ec04191dec59cdc930822fa2aff726ee25cddd0f71fd457dedf31026bff1da121d93af8b768 SHA512 62d6787d88a2e716f0ac04fc49f6cdc586e473a660ee754ff66961922ae78bcc75d1f78b091e78557dd60f006e8e480114738c7b4ff71beac804e4fc9603240b -DIST urllib3-2.5.0.tar.gz 393185 BLAKE2B 3885be1dae81cb63cfd0c52242b8ff342e4fb398816f94b556e929af0328f4063d705f15201005f4247b278420794984277999751170e124c23ac99c6dc881d4 SHA512 f417a2745bc9750da23916690937e5c0dfe0534354f2c1c9f056baf16554a831a28937acca2b1f23941d5b6e87a372f2e074508eaf2c3304fd1014b8afc3295e +DIST urllib3-2.6.3.tar.gz 435556 BLAKE2B 9e8cd91390da4ba0b71aa357735c25cd59f1509293a71d5c382a1e9b973c10158f0774b4da9e9dcf13932bdaeddff07ea67242bb92a981855e5d7afec153d629 SHA512 663c83a78908dac9bb05c7ac833183c2fdc2969d0662d21dd8751ba13c51880ee264f7804760f33ebdabfd1c1f04a5d44171a420396de6ae582f9789801b141c +DIST urllib3-2.6.3.tar.gz.provenance 9346 BLAKE2B 2b2cd838678933a5faa513e6974627f073826107d293e09354508f651c536bb63fe065406e1d8b845b933ee5db97b9e5a50ddb0417c52accab6e5367451bb507 SHA512 bb734fa663a6ff50bda97d2956825ef8eae3b0959f045f15f8b816881677eaa17eea8d832926fc664ee9398c33731d3917814617b32dfb7f40776cb6e69cd408 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/urllib3/urllib3-2.5.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/urllib3/urllib3-2.6.3.ebuild similarity index 83% rename from sdk_container/src/third_party/portage-stable/dev-python/urllib3/urllib3-2.5.0.ebuild rename to sdk_container/src/third_party/portage-stable/dev-python/urllib3/urllib3-2.6.3.ebuild index afdb4310ce..ce23c7a78c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/urllib3/urllib3-2.5.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/urllib3/urllib3-2.6.3.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # please keep this ebuild at EAPI 8 -- sys-apps/portage dep EAPI=8 DISTUTILS_USE_PEP517=hatchling +PYPI_VERIFY_REPO=https://github.com/urllib3/urllib3 PYTHON_TESTED=( python3_{11..14} pypy3_11 ) PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" ) PYTHON_REQ_USE="ssl(+)" @@ -27,7 +28,7 @@ SRC_URI+=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris" IUSE="brotli http2 test zstd" RESTRICT="!test? ( test )" @@ -36,12 +37,16 @@ RESTRICT="!test? ( test )" RDEPEND=" >=dev-python/pysocks-1.5.8[${PYTHON_USEDEP}] =dev-python/brotlicffi-0.8.0[${PYTHON_USEDEP}] ) + brotli? ( >=dev-python/brotlicffi-1.2.0.0[${PYTHON_USEDEP}] ) http2? ( =dev-python/h2-4[${PYTHON_USEDEP}] ) - zstd? ( >=dev-python/zstandard-0.18.0[${PYTHON_USEDEP}] ) + zstd? ( + $(python_gen_cond_dep ' + >=dev-python/backports-zstd-1.0.0[${PYTHON_USEDEP}] + ' 3.{11..13}) + ) " BDEPEND=" dev-python/hatch-vcs[${PYTHON_USEDEP}] @@ -61,8 +66,10 @@ BDEPEND=" dev-python/trio[\${PYTHON_USEDEP}] >=dev-python/tornado-4.2.1[\${PYTHON_USEDEP}] >=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}] - >=dev-python/zstandard-0.18.0[\${PYTHON_USEDEP}] " "${PYTHON_TESTED[@]}") + $(python_gen_cond_dep ' + >=dev-python/backports-zstd-1.0.0[${PYTHON_USEDEP}] + ' 3.{11..13}) ) " @@ -93,7 +100,8 @@ python_test() { test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_{2,3}::test_http2_probe_blocked_per_thread ) - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + local EPYTEST_PLUGINS=( pytest-timeout ) + local EPYTEST_RERUNS=10 local EPYTEST_XDIST=1 - epytest -p timeout -p rerunfailures --reruns=10 --reruns-delay=2 + epytest --reruns-delay=2 }