gentoo auto-resync : 01:06:2023 - 21:27:08

3 files changed, 9 insertions, 58 deletions

diff --git a/dev-python/requests-toolbelt/Manifest b/dev-python/requests-toolbelt/Manifest
index 0b857a383a55..58f99d9336bf 100644
--- a/dev-python/requests-toolbelt/Manifest
+++ b/dev-python/requests-toolbelt/Manifest
@@ -1,5 +1,3 @@
-DIST requests-toolbelt-0.10.1.gh.tar.gz 201504 BLAKE2B 48c5b9f46000d9809e482278626bbce805b93ed2a4a5d074bad4f7fbda75984dd55919eca31909c98c9a74ca7b323e73c90691dced0734964621d4ba5748d464 SHA512 ad6dfe3329c8be5a4521d223d25ec303201e706b34199c084efd0a30b8bc8cfb3382e80a502dc25bd5f7e5b2774a119d2255c49408979aaec45e221f412a7b52
 DIST requests-toolbelt-1.0.0.gh.tar.gz 199298 BLAKE2B c8a75005fd27bb725cabe7c6e4493b65bfc6914d7b22490c10869f0f35f6f08d0e829196e7de2e7ec07fed7ad52559f550bfbe072020ed8e782543273c903805 SHA512 1ee5d5dbb0d140796c81d42c051ccfab8810bf5ec511b32c9a54b4adccbab460f3108acdfe5a65b3cb68377586ff0f55206bf231e64651aaea077feda7984953
-EBUILD requests-toolbelt-0.10.1.ebuild 1296 BLAKE2B 58dbcac71edad43b15689d9ddfb9ca5dfb1745ee14ee2c0c4f952207eeed1b0bdabd43e21bc53d01e8649f71159b9b338282cb6920faff161cb01d4ef3d715fb SHA512 79f2c98195f28f44752ca9c89c32b9ec2396ca949fd24757ec6485d1a2c691503590b519555f994e8369c7fed2fba6ac45c4ad480af00efcf48b4ff121b3d2da
-EBUILD requests-toolbelt-1.0.0.ebuild 1518 BLAKE2B 26ed4226d10dd537c63434066314b276fcc5daa26b4cf1904f0d1c5b30a1e8ac2deb702511a3c26dcbd4e69748f1cfaee2175ffc7562cec6a31d833e0221a542 SHA512 5561e05657b3fe794a6196055aef9440e02a6bee205b6c748b890dcde73a0fd471b9204bde518eec3ac0541a6f91382968acb955e718ca893fc48a81cb8cbc6c
+EBUILD requests-toolbelt-1.0.0.ebuild 1817 BLAKE2B 068babd67f2fa48f5ab435e950ebb10363b02f8a514cf2a90084da5a981fea36c6784c1c9171b7f6851eb5a1778ca890d3cdfe2db9d1ac38c27a1c9655139ee2 SHA512 fc708057f6984f91f3d34be5d2d68e9242324696f677e15fc514558921966066eae42cd22caa976b912b8deece72e50a8be0f6ef34d94af1dfc6f0e72e6dd18a
 MISC metadata.xml 480 BLAKE2B b9318bbcf29b8f6088bbc611cb3099504c9a244018e15f24fda8e0dc86b445206ada8442115e667fc2446ae6ac3747c38ddf9b0ada0cd95290a559616f5a1305 SHA512 0952fb847be40e9dc8e49172fd6c4485db3840246dbda87873addd45ee23e20494fa39a173509ee7712e2a5ffe516f5bacee4afe3091c0bfae16a8fc4e750b1d
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.10.1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.10.1.ebuild
deleted file mode 100644
index bd7bc8c25d86..000000000000
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.10.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A utility belt for advanced users of python-requests"
-HOMEPAGE="
-	https://toolbelt.readthedocs.io/
-	https://github.com/requests/toolbelt/
-	https://pypi.org/project/requests-toolbelt/
-"
-SRC_URI="
-	https://github.com/requests/toolbelt/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${P#requests-}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/betamax[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( AUTHORS.rst HISTORY.rst README.rst )
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/test_multipart_encoder.py::TestFileFromURLWrapper::test_no_content_length_header
-	tests/test_multipart_encoder.py::TestFileFromURLWrapper::test_read_file
-	tests/test_multipart_encoder.py::TestMultipartEncoder::test_reads_file_from_url_wrapper
-)
-
-EPYTEST_IGNORE=(
-	# certs have expired
-	# (if you ever fix this, look into git history for proper
-	# cryptography/pyopenssl logic)
-	tests/test_x509_adapter.py
-)
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-1.0.0.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-1.0.0.ebuild
index e7aefb234fe6..5d60cbcca90d 100644
--- a/dev-python/requests-toolbelt/requests-toolbelt-1.0.0.ebuild
+++ b/dev-python/requests-toolbelt/requests-toolbelt-1.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit distutils-r1
 
@@ -22,7 +22,7 @@ S=${WORKDIR}/${P#requests-}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test-rust"
 
 RDEPEND="
@@ -34,6 +34,7 @@ BDEPEND="
 		test-rust? (
 			dev-python/cryptography[${PYTHON_USEDEP}]
 			dev-python/pyopenssl[${PYTHON_USEDEP}]
+			dev-python/trustme[${PYTHON_USEDEP}]
 		)
 	)
 "
@@ -48,11 +49,15 @@ python_test() {
 		tests/test_multipart_encoder.py::TestFileFromURLWrapper::test_no_content_length_header
 		tests/test_multipart_encoder.py::TestFileFromURLWrapper::test_read_file
 		tests/test_multipart_encoder.py::TestMultipartEncoder::test_reads_file_from_url_wrapper
+		# tests themself are broken with newer urllib3
+		tests/test_dump.py::TestDumpRealResponses::test_dump_{all,response}
+		tests/test_sessions.py::TestBasedSession::test_{prepared_,}request_{with,override}_base
 	)
 	local EPYTEST_IGNORE=()
 
 	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]" ||
-		! has_version "dev-python/pyopenssl[${PYTHON_USEDEP}]"
+		! has_version "dev-python/pyopenssl[${PYTHON_USEDEP}]" ||
+		! has_version "dev-python/trustme[${PYTHON_USEDEP}]"
 	then
 		EPYTEST_IGNORE+=(
 			tests/test_x509_adapter.py