commit: 5de4c34f3962d77d3cb9a53a5d50c5ff75bdd2fa
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 12 03:25:29 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 12 03:27:25 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5de4c34f
dev-python/uvicorn: make Rust test dependencies optional
Signed-off-by: Sam James <sam <AT> gentoo.org>
...corn-0.21.1.ebuild => uvicorn-0.21.1-r1.ebuild} | 6 +++---
dev-python/uvicorn/uvicorn-0.21.1.ebuild | 23 +++-------------------
profiles/features/wd40/package.use.mask | 2 +-
3 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/dev-python/uvicorn/uvicorn-0.21.1.ebuild
b/dev-python/uvicorn/uvicorn-0.21.1-r1.ebuild
similarity index 94%
copy from dev-python/uvicorn/uvicorn-0.21.1.ebuild
copy to dev-python/uvicorn/uvicorn-0.21.1-r1.ebuild
index 18a059cd9646..de4c6ee2d808 100644
--- a/dev-python/uvicorn/uvicorn-0.21.1.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.21.1-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv"
IUSE="test-rust"
RDEPEND="
@@ -38,11 +38,11 @@ BDEPEND="
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.4[${PYTHON_USEDEP}]
dev-python/wsproto[${PYTHON_USEDEP}]
test-rust? (
dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/trustme[${PYTHON_USEDEP}]
dev-python/watchfiles[${PYTHON_USEDEP}]
)
)
@@ -81,7 +81,7 @@ python_test() {
)
EPYTEST_IGNORE+=(
- # dev-python/watchdog
+ # dev-python/watchfiles
tests/supervisors/test_reload.py
# dev-python/cryptography
tests/test_ssl.py
diff --git a/dev-python/uvicorn/uvicorn-0.21.1.ebuild
b/dev-python/uvicorn/uvicorn-0.21.1.ebuild
index 18a059cd9646..4dbce7762222 100644
--- a/dev-python/uvicorn/uvicorn-0.21.1.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.21.1.ebuild
@@ -23,7 +23,6 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv"
-IUSE="test-rust"
RDEPEND="
>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
@@ -33,6 +32,7 @@ RDEPEND="
BDEPEND="
test? (
dev-python/a2wsgi[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
dev-python/httpx[${PYTHON_USEDEP}]
dev-python/pytest-asyncio[${PYTHON_USEDEP}]
dev-python/pytest-mock[${PYTHON_USEDEP}]
@@ -41,17 +41,9 @@ BDEPEND="
dev-python/trustme[${PYTHON_USEDEP}]
>=dev-python/websockets-10.4[${PYTHON_USEDEP}]
dev-python/wsproto[${PYTHON_USEDEP}]
- test-rust? (
- dev-python/cryptography[${PYTHON_USEDEP}]
- dev-python/watchfiles[${PYTHON_USEDEP}]
- )
)
"
-PATCHES=(
- "${FILESDIR}"/${PN}-0.21.1-optional-rust.patch
-)
-
distutils_enable_tests pytest
python_test() {
@@ -72,19 +64,10 @@ python_test() {
fi
local EPYTEST_IGNORE=()
-
- if ! use test-rust ; then
- EPYTEST_DESELECT+=(
- # dev-python/cryptography
- tests/test_config.py::test_ssl_config
- tests/test_config.py::test_ssl_config_combined
- )
-
+ # love from Rust world
+ if ! has_version "dev-python/watchfiles[${PYTHON_USEDEP}]"; then
EPYTEST_IGNORE+=(
- # dev-python/watchdog
tests/supervisors/test_reload.py
- # dev-python/cryptography
- tests/test_ssl.py
)
fi
diff --git a/profiles/features/wd40/package.use.mask
b/profiles/features/wd40/package.use.mask
index 6a03a500e105..9b572fad640f 100644
--- a/profiles/features/wd40/package.use.mask
+++ b/profiles/features/wd40/package.use.mask
@@ -92,7 +92,7 @@ www-apps/roundup ssl
dev-python/anyio test
dev-python/httpcore test
dev-python/httpx test
-dev-python/uvicorn test
+<dev-python/uvicorn-0.21.1-r1 test
dev-python/aiohttp-socks test
# WANG Xuerui <[email protected]> (2022-05-13)
