summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/urllib3/urllib3-1.24.2.ebuild17
-rw-r--r--dev-python/urllib3/urllib3-1.25.7.ebuild23
-rw-r--r--dev-python/urllib3/urllib3-1.25.8.ebuild23
3 files changed, 40 insertions, 23 deletions
diff --git a/dev-python/urllib3/urllib3-1.24.2.ebuild b/dev-python/urllib3/urllib3-1.24.2.ebuild
index 744dfd74e26..7be6c90f2f8 100644
--- a/dev-python/urllib3/urllib3-1.24.2.ebuild
+++ b/dev-python/urllib3/urllib3-1.24.2.ebuild
@@ -32,10 +32,12 @@ RDEPEND="
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
- ${RDEPEND}
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- >=www-servers/tornado-4.2.1[$(python_gen_usedep python{2_7,3_{5,6,7}})]
+ $(python_gen_cond_dep "
+ ${RDEPEND}
+ dev-python/mock[\${PYTHON_USEDEP}]
+ dev-python/pytest[\${PYTHON_USEDEP}]
+ >=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
+ " 'python3*')
)
"
@@ -53,7 +55,12 @@ python_prepare_all() {
python_test() {
# FIXME: get tornado ported
case ${EPYTHON} in
- python2*|python3.[567])
+ python2*)
+ ewarn "Tests are being skipped for Python 2 in order to reduce the number"
+ ewarn "of circular dependencies for Python 2 removal. Please test"
+ ewarn "manually in a virtualenv."
+ ;;
+ python3*)
pytest -vv || die "Tests fail with ${EPYTHON}"
;;
esac
diff --git a/dev-python/urllib3/urllib3-1.25.7.ebuild b/dev-python/urllib3/urllib3-1.25.7.ebuild
index de5188583cf..7dec43ea895 100644
--- a/dev-python/urllib3/urllib3-1.25.7.ebuild
+++ b/dev-python/urllib3/urllib3-1.25.7.ebuild
@@ -33,14 +33,14 @@ RDEPEND="
BDEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
- ${RDEPEND}
- dev-python/brotlipy[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- >=dev-python/trustme-0.5.3[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
- ' python{2_7,3_{5,6,7}})
+ $(python_gen_cond_dep "
+ ${RDEPEND}
+ dev-python/brotlipy[\${PYTHON_USEDEP}]
+ dev-python/mock[\${PYTHON_USEDEP}]
+ dev-python/pytest[\${PYTHON_USEDEP}]
+ >=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
+ >=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
+ " 'python3*')
)
"
@@ -72,7 +72,12 @@ python_prepare_all() {
python_test() {
# FIXME: get tornado ported
case ${EPYTHON} in
- python2*|python3.[567])
+ python2*)
+ ewarn "Tests are being skipped for Python 2 in order to reduce the number"
+ ewarn "of circular dependencies for Python 2 removal. Please test"
+ ewarn "manually in a virtualenv."
+ ;;
+ python3*)
pytest -vv || die "Tests fail with ${EPYTHON}"
;;
esac
diff --git a/dev-python/urllib3/urllib3-1.25.8.ebuild b/dev-python/urllib3/urllib3-1.25.8.ebuild
index e21205e47f9..5ac937b017b 100644
--- a/dev-python/urllib3/urllib3-1.25.8.ebuild
+++ b/dev-python/urllib3/urllib3-1.25.8.ebuild
@@ -33,14 +33,14 @@ RDEPEND="
BDEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
- ${RDEPEND}
- dev-python/brotlipy[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- >=dev-python/trustme-0.5.3[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
- ' 'python*')
+ $(python_gen_cond_dep "
+ ${RDEPEND}
+ dev-python/brotlipy[\${PYTHON_USEDEP}]
+ dev-python/mock[\${PYTHON_USEDEP}]
+ dev-python/pytest[\${PYTHON_USEDEP}]
+ >=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
+ >=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
+ " 'python3*')
)
"
@@ -73,7 +73,12 @@ python_test() {
local -x CI=1
# FIXME: get tornado ported
case ${EPYTHON} in
- python*)
+ python2*)
+ ewarn "Tests are being skipped for Python 2 in order to reduce the number"
+ ewarn "of circular dependencies for Python 2 removal. Please test"
+ ewarn "manually in a virtualenv."
+ ;;
+ python3*)
pytest -vv || die "Tests fail with ${EPYTHON}"
;;
esac