gentoo auto-resync : 24:09:2024 - 01:25:19

4 files changed, 84 insertions, 54 deletions

diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest
index 2124eb841e04..163b27b3175c 100644
--- a/net-misc/httpie/Manifest
+++ b/net-misc/httpie/Manifest
@@ -1,7 +1,7 @@
 AUX httpie-3.2.1-pytest-fixtures.patch 19140 BLAKE2B df54635098d0da8b9b8c37dd4a144caf330f6ca9ca657de90ea510f91498735700b84b6ce48d91ff1ed88eecfa0d80a0ac626d2d8384a8ac68d9a7303d048509 SHA512 b881cefb48079ffa5ee0450e591185e15bf9052ecd16ccce7a5faddc7cc4cc9cf3f73cfcdde8dca129969b182086a2c1d867669261f91196df4318aae466a7b0
 AUX httpie-urllib3-2-fixes.patch 1852 BLAKE2B 8298b18a64e0fc99f422d5c3260ca9b567de08f9cc7b0d2cb0c20ba675a717dd1e4cff03bc036beead71f58426153e2b040fea06e4383df768d004afdbd807e7 SHA512 c926450b4ef43274e0e70b51605ff020ccf82a0704d86814590cbe40db5ea1329ec357b7f630f860b09549f76a34211c3799956b67d8f2f0db51ad14c1ba53b9
-DIST httpie-3.2.1.gh.tar.gz 1276550 BLAKE2B 627aa3db762e9e407f882be2c4267f5227301b189695537e7ac69ff140d6d39292251e131f9b9e7761e904a736d112bb4c1f5c6708c1468c6309474ee8c140b6 SHA512 ffcf6050138c49d5acb01f214d9b3fee6c78502c4c6dc45a295bafc88aafd1789f97a69c922f6e093fb48a402c1f83a7fff5307849130df81c4bcb2d595a03bf
 DIST httpie-3.2.2.gh.tar.gz 1279161 BLAKE2B aa5df73acbbe635fbfd3db458a2289042091a27d7b1791e9739874c1882e436814f74eec2b695f8acd76f9b9dd210f43dd9f8b7c0feea0cf4782b30f0e53b91a SHA512 5e95eba5a5ca8017dfd76ace525c57d2931d8918d51e84e8744eb9393cda5ae8e6cd6a1455c4aa82e50fa35edc35468a8b3582169c8f94858e61b09548cfa13d
-EBUILD httpie-3.2.1-r2.ebuild 1255 BLAKE2B 760084b16fbcd95341e67b24db2919dc84d75e20063fee3793245fc659a18bf816d64348a12aefa22f843d40e216da69588cdde8736f74b4c1b724c128e19502 SHA512 b984af94d3104df7956ede9485f563f23ef8835d50d0524de632f12b02ca2429ba4c2ba587c7023d82538fad3428b0103e9fca623e5ae0bfbc9ad9a3f9bd7d70
+DIST httpie-3.2.3.gh.tar.gz 1279649 BLAKE2B 3404078512d9b61304560cf2226ed8837ab362f4627e73200d3379878f0ce52ca7c32160232f78544403cbe85d8ca6f5ad8f97d36fd04b1362d95d3e871581ab SHA512 0b44c15d42f73533a94f29e01c1465439cc937994deb8699135bcd56f77392ec0198c57d159f10295e3e0704dcdac486d6df4ce9f8478b914db300c92aaaf01d
 EBUILD httpie-3.2.2.ebuild 3084 BLAKE2B 8286a2241fd3976856f2ffc3a322cfebb256842149d6edf429fc790d321021669cecbe4d2a37b60156f3dbfe9a70398fe8920e35a0bffce904eb6d09d3419bc4 SHA512 ab79ad610ac752e8eccd3e6dbf400c0c7ce4531937826cea5f3dd64fe9206cfbc61767a00083d95572b5c676b7c82bfbf205dbed69dee268d2f80644caa8dac8
-MISC metadata.xml 933 BLAKE2B a0e1a09be17802bd416493a82c30eeef966985e7e9dd75a0c00de03d36b90b52883cf274d5257f62e2881fad6c8505cfefe47394c2796b97c9973e8a82fd2598 SHA512 dcb5b425e423af7fe38f82f5f32d2cce740789e2f7cae1dbc32a0cf46b6cd1be107fbe9fffa139f9a699042681bdd37a0fa7141fcf8b991cdea8991ed89a694c
+EBUILD httpie-3.2.3.ebuild 3024 BLAKE2B 385002de6326598d77166d04b238fd9e6ec17dca5006d44e2e1c5579406adf92303140301e7cd1f22b00389f4e803f53f32b58fb9fb5710eaeca343621ae47a6 SHA512 7da4fb0c17b57e3cac3a51b8f3df6da097ac9f349a3995d5e0bd1038ff875bf1acc2d49a62b61f300c7f6ac567d43788316400ca277568516030000dc6b3c0a4
+MISC metadata.xml 927 BLAKE2B 62ea31f84a9662037fa6d77050eacfa30734f89be5f0c8ed5e23c1efb46e620d0c495842c2195aec19366f63bae369a00fd0f3e60074d0fe333a504d557fa94e SHA512 09a4de0bc77bc8951df636ee68b237bf084719b914e9219de327333d74b6f6863791f5d191eea2e58350a688f6a1c2f617cea58d5c271944a68595a0a0b0e675
diff --git a/net-misc/httpie/httpie-3.2.1-r2.ebuild b/net-misc/httpie/httpie-3.2.1-r2.ebuild
deleted file mode 100644
index 217a2307a2d1..000000000000
--- a/net-misc/httpie/httpie-3.2.1-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="ssl(+)"
-DISTUTILS_USE_PEP517=setuptools
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Modern command line HTTP client"
-HOMEPAGE="https://httpie.io/ https://pypi.org/project/httpie/"
-SRC_URI="https://github.com/httpie/httpie/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/charset-normalizer[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/multidict[${PYTHON_USEDEP}]
-	dev-python/rich[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-urllib3-2-fixes.patch"
-)
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	newbashcomp extras/httpie-completion.bash http
-	insinto /usr/share/fish/vendor_completions.d
-	newins extras/httpie-completion.fish http.fish
-	distutils-r1_python_install_all
-}
diff --git a/net-misc/httpie/httpie-3.2.3.ebuild b/net-misc/httpie/httpie-3.2.3.ebuild
new file mode 100644
index 000000000000..ba88195f0cd2
--- /dev/null
+++ b/net-misc/httpie/httpie-3.2.3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ssl(+)"
+DISTUTILS_USE_PEP517=setuptools
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Modern command line HTTP client"
+HOMEPAGE="https://httpie.io/ https://pypi.org/project/httpie/"
+SRC_URI="https://github.com/httpie/cli/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}"/cli-${PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/charset-normalizer[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/multidict[${PYTHON_USEDEP}]
+	dev-python/rich[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# https://github.com/httpie/cli/issues/1530
+	tests/test_compress.py::test_compress_form
+	tests/test_binary.py::TestBinaryResponseData
+
+	# Needs network
+	'tests/test_cookie_on_redirects.py::test_explicit_user_set_cookie_in_session[remote_httpbin]'
+	'tests/test_cookie_on_redirects.py::test_explicit_user_set_cookie[remote_httpbin]'
+	'tests/test_cookie_on_redirects.py::test_explicit_user_set_headers[False-remote_httpbin]'
+	'tests/test_cookie_on_redirects.py::test_explicit_user_set_headers[True-remote_httpbin]'
+	tests/test_cookie_on_redirects.py::test_saved_session_cookie_pool
+	tests/test_cookie_on_redirects.py::test_saved_session_cookies_on_different_domain
+	'tests/test_cookie_on_redirects.py::test_saved_session_cookies_on_redirect[httpbin-httpbin-remote_httpbin-False]'
+	'tests/test_cookie_on_redirects.py::test_saved_session_cookies_on_redirect[httpbin-remote_httpbin-httpbin-True]'
+	'tests/test_cookie_on_redirects.py::test_saved_session_cookies_on_redirect[httpbin-remote_httpbin-remote_httpbin-False]'
+	'tests/test_cookie_on_redirects.py::test_saved_user_set_cookie_in_session[remote_httpbin]'
+	'tests/test_sessions.py::test_secure_cookies_on_localhost[remote_httpbin-expected_cookies1]'
+	tests/test_tokens.py::test_verbose_chunked
+	tests/test_uploads.py::test_chunked_form
+	tests/test_uploads.py::test_chunked_json
+	tests/test_uploads.py::test_chunked_raw
+	tests/test_uploads.py::test_chunked_stdin
+	tests/test_uploads.py::test_chunked_stdin_multiple_chunks
+	tests/test_uploads.py::TestMultipartFormDataFileUpload::test_multipart_chunked
+	tests/test_uploads.py::TestRequestBodyFromFilePath::test_request_body_from_file_by_path_chunked
+)
+
+EPYTEST_IGNORE=(
+	# Assumes installation in a clean venv
+	tests/test_plugins_cli.py
+)
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	newbashcomp extras/httpie-completion.bash http
+	insinto /usr/share/fish/vendor_completions.d
+	newins extras/httpie-completion.fish http.fish
+	distutils-r1_python_install_all
+}
diff --git a/net-misc/httpie/metadata.xml b/net-misc/httpie/metadata.xml
index cba10e14d2cc..3ee7ac326ccd 100644
--- a/net-misc/httpie/metadata.xml
+++ b/net-misc/httpie/metadata.xml
@@ -12,10 +12,10 @@
 		servers.
 	</longdescription>
 	<upstream>
-		<bugs-to>https://github.com/httpie/httpie/issues</bugs-to>
+		<bugs-to>https://github.com/httpie/cli/issues</bugs-to>
 		<changelog>https://raw.githubusercontent.com/httpie/httpie/master/CHANGELOG.md</changelog>
 		<doc>https://httpie.io/docs</doc>
-		<remote-id type="github">httpie/httpie</remote-id>
+		<remote-id type="github">httpie/cli</remote-id>
 		<remote-id type="pypi">httpie</remote-id>
 	</upstream>
 </pkgmetadata>