gentoo resync : 29.12.2022

4 files changed, 96 insertions, 17 deletions

diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index d556cfb35b39..49707d1e7fc2 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -1,5 +1,7 @@
-DIST uvicorn-0.17.5.tar.gz 707840 BLAKE2B 70a5aa4c084f63231b2c4f11c9a4add6a84362789243fe59b4c954665b67f859dcd92076454cac7b960d30c878bccb52e6da5232e052d70ca0a71f4035804b96 SHA512 b73c99d03957bf5f37957386da77cad68e0c9603fb0bfe48ab81f1066953ca01bc75b2eb458a20a587df4f2e1f591fe1c56f26d8df84070c833ccbb912d55ca2
 DIST uvicorn-0.17.6.tar.gz 708048 BLAKE2B 83b06907c8109b38e13930d8b73584682fa4e34fe7e51fe14b6ca1ddc7ef8122d950a09e31cb364a02f5f12eead5d0522b41cbf428509c6900604d4e2776dfb2 SHA512 d5c5223759d59648f279e22f7e6af728fe8117ed75488d125c1db3e5e9d385a50d574cff72ac46db4eb0a78d0e4f690096cfe78c774674dfba61860e55b7494e
-EBUILD uvicorn-0.17.5.ebuild 1363 BLAKE2B b0810c5d062adc3ebfe579d99debdb4a6bab5b1d4935d9cb59e43bb82e341916680d84a070c910e17b63a5416c79625e1754422154a6a3ee3443f134c7264dc4 SHA512 5cea073561c1c1ce551a0d48c25d6655b6e1a79cd56653c8a1510d01775473eb0276f7f0878f808f07c283f0636160fd9b5fdbb4c95b79fe3f384928bad1961f
-EBUILD uvicorn-0.17.6.ebuild 1402 BLAKE2B 855b49eb5fc0c8c27f8366be7612487e8bdc41838001d6b8c8f15d5d041c361ec1de7959f5d89be03cec3adcb39b9a263287289c34e28b8df876d42882d51b3b SHA512 2fd187bdced5a62ff4b96440515ea9c36aff9ccc0712fe7d81dd94d4d27b34eef2a087e2f9612e3b5bf83858bc6dfc3fe940731c299bccc1c0f259ae6981fbda
+DIST uvicorn-0.18.1.gh.tar.gz 712588 BLAKE2B f99c173015d3efdd6f7d6257384045542cbf95ab65fdd84f47ee5df4677865d0b4d6de5f23db0bc2713cb286242a029b056c4076268b14d238a3e9f57c02fc42 SHA512 d8650ace78d19c44d03de8413bf06b2dd3208c7e47c4d9e17ecbed99eef938ec08eb249b204713139b985ae4b117c7da64836c25bf8d20610363bedcf1ebf990
+DIST uvicorn-0.18.2.gh.tar.gz 712706 BLAKE2B d8d300579d945a5c2f51b7746b93cd64710c103cd0b7694ce858ec0f4e9dc09f89e9663529dd84c13c9f6334d0f4543cc9442e94aedf8dbddd72a6a0394ba370 SHA512 d2e05198cd833efbe7dddffc30f9a52be3168192269cd493816df8a7d4053e312f534988ee09c5270d63f52dfa48d0b105862c9e05acad41ebf3a40e5fa1aa76
+EBUILD uvicorn-0.17.6.ebuild 1394 BLAKE2B 1f9eb4a37f3476787f643dd1b06c846ee2d4f0aa08aedfb74589097e9163b24a4b5642bf8fdb672bbb61537a15bdbee3ecd69962bd5edb42f969b94202307320 SHA512 7e478a4e05e4ae6b097eb018ec4bc105812a368389e0b663100f1ae0abad5c11a9ceb8555119d01c1d5397bc56df9af801129ed83e246a69538aa262fa39157f
+EBUILD uvicorn-0.18.1.ebuild 1681 BLAKE2B 3197c880ed7f44d0610a270db52c07957bd377388abac1a19991a324782523c7c26669575fc6195ee403ecfc12cad7b85001e4920f6de5dbc237c03dfe42570d SHA512 2c32dcbe9e0eaa273f7908a6208751438951959756ebae3924c21039a30b0815e5cf0131bb9c1631b869cec033c1a32740d2a9b68fc1571c2145fe30c6425e1e
+EBUILD uvicorn-0.18.2.ebuild 1681 BLAKE2B 3197c880ed7f44d0610a270db52c07957bd377388abac1a19991a324782523c7c26669575fc6195ee403ecfc12cad7b85001e4920f6de5dbc237c03dfe42570d SHA512 2c32dcbe9e0eaa273f7908a6208751438951959756ebae3924c21039a30b0815e5cf0131bb9c1631b869cec033c1a32740d2a9b68fc1571c2145fe30c6425e1e
 MISC metadata.xml 451 BLAKE2B af9be617c95128297e3455b503e198e13c373244094f6aa9c80837945c3f9f023f1874efa28d4ffa8b241feb9a4e8c7f3d3534e96966733bd5593bffb90904a5 SHA512 4d76bab5c20f7cad81fa56a28c9be07bf2c2ebc412fc647f073215d437a2550eca247b8419df71d04200d0fdf545520684db0b6f4953e73848f69a4f4ad6931e
diff --git a/dev-python/uvicorn/uvicorn-0.17.6.ebuild b/dev-python/uvicorn/uvicorn-0.17.6.ebuild
index 05df8e9b4929..f69e2acde09d 100644
--- a/dev-python/uvicorn/uvicorn-0.17.6.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.17.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/uvicorn/uvicorn-0.17.5.ebuild b/dev-python/uvicorn/uvicorn-0.18.1.ebuild
index 7e04b9e21958..de246a78f9d4 100644
--- a/dev-python/uvicorn/uvicorn-0.17.5.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.18.1.ebuild
@@ -4,17 +4,17 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
-inherit distutils-r1
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Lightning-fast ASGI server implementation"
 HOMEPAGE="https://www.uvicorn.org/"
-SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
@@ -31,17 +31,32 @@ BDEPEND="
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/trustme[${PYTHON_USEDEP}]
 		>=dev-python/websockets-10.0[${PYTHON_USEDEP}]
-		dev-python/watchgod[${PYTHON_USEDEP}]
 		dev-python/wsproto[${PYTHON_USEDEP}]
 	)
 "
 
 distutils_enable_tests pytest
 
-EPYTEST_DESELECT=(
-	# too long path for unix socket
-	tests/test_config.py::test_bind_unix_socket_works_with_reload_or_workers
-	# need unpackaged httptools
-	"tests/middleware/test_logging.py::test_trace_logging_on_http_protocol[httptools]"
-	tests/protocols/test_http.py::test_fragmentation
-)
+python_test() {
+	local EPYTEST_DESELECT=(
+		# too long path for unix socket
+		tests/test_config.py::test_bind_unix_socket_works_with_reload_or_workers
+		# need unpackaged httptools
+		"tests/middleware/test_logging.py::test_trace_logging_on_http_protocol[httptools]"
+		tests/protocols/test_http.py::test_fragmentation
+	)
+
+	local EPYTEST_IGNORE=()
+	# love from Rust world
+	if ! has_version "dev-python/watchfiles[${PYTHON_USEDEP}]"; then
+		EPYTEST_IGNORE+=(
+			tests/supervisors/test_reload.py
+		)
+	fi
+
+	epytest
+}
+
+pkg_postinst() {
+	optfeature "auto reload on file changes" dev-python/watchfiles
+}
diff --git a/dev-python/uvicorn/uvicorn-0.18.2.ebuild b/dev-python/uvicorn/uvicorn-0.18.2.ebuild
new file mode 100644
index 000000000000..de246a78f9d4
--- /dev/null
+++ b/dev-python/uvicorn/uvicorn-0.18.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Lightning-fast ASGI server implementation"
+HOMEPAGE="https://www.uvicorn.org/"
+SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/httpx[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/python-dotenv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		>=dev-python/websockets-10.0[${PYTHON_USEDEP}]
+		dev-python/wsproto[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# too long path for unix socket
+		tests/test_config.py::test_bind_unix_socket_works_with_reload_or_workers
+		# need unpackaged httptools
+		"tests/middleware/test_logging.py::test_trace_logging_on_http_protocol[httptools]"
+		tests/protocols/test_http.py::test_fragmentation
+	)
+
+	local EPYTEST_IGNORE=()
+	# love from Rust world
+	if ! has_version "dev-python/watchfiles[${PYTHON_USEDEP}]"; then
+		EPYTEST_IGNORE+=(
+			tests/supervisors/test_reload.py
+		)
+	fi
+
+	epytest
+}
+
+pkg_postinst() {
+	optfeature "auto reload on file changes" dev-python/watchfiles
+}