| 1 |
commit: d2a8804c3475b6dda967ece362f51ccb24fc0fd9 |
| 2 |
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 10 20:35:42 2020 +0000 |
| 4 |
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 10 21:07:51 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2a8804c |
| 7 |
|
| 8 |
dev-python/pyftpdlib: support Py3.9, remove unnecessary deps |
| 9 |
|
| 10 |
Also make python_test slightly prettier and remove the explicit setuptools |
| 11 |
dependency. |
| 12 |
|
| 13 |
Package-Manager: Portage-3.0.6, Repoman-3.0.1 |
| 14 |
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org> |
| 15 |
|
| 16 |
...dlib-1.5.6.ebuild => pyftpdlib-1.5.6-r1.ebuild} | 22 ++++++---------------- |
| 17 |
1 file changed, 6 insertions(+), 16 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild |
| 20 |
similarity index 83% |
| 21 |
rename from dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild |
| 22 |
rename to dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild |
| 23 |
index ef5525f50ad..c98a11ff049 100644 |
| 24 |
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild |
| 25 |
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild |
| 26 |
@@ -2,7 +2,8 @@ |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
EAPI=7 |
| 30 |
-PYTHON_COMPAT=( python3_{6,7,8} ) |
| 31 |
+ |
| 32 |
+PYTHON_COMPAT=( python3_{6,7,8,9} ) |
| 33 |
PYTHON_REQ_USE="ssl(+)" |
| 34 |
|
| 35 |
inherit distutils-r1 |
| 36 |
@@ -19,13 +20,10 @@ RESTRICT="!test? ( test )" |
| 37 |
|
| 38 |
RDEPEND=" |
| 39 |
ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] ) |
| 40 |
- dev-python/pysendfile[${PYTHON_USEDEP}] |
| 41 |
" |
| 42 |
-DEPEND=" |
| 43 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
| 44 |
+BDEPEND=" |
| 45 |
test? ( |
| 46 |
${RDEPEND} |
| 47 |
- dev-python/mock[${PYTHON_USEDEP}] |
| 48 |
dev-python/psutil[${PYTHON_USEDEP}] |
| 49 |
dev-python/pyopenssl[${PYTHON_USEDEP}] |
| 50 |
dev-python/pytest[${PYTHON_USEDEP}] |
| 51 |
@@ -40,6 +38,8 @@ python_test() { |
| 52 |
pytest ${PN}/test/test_misc.py || die "Tests failed with ${EPYTHON}" |
| 53 |
# Some of these tests tend to fail |
| 54 |
local skipped_tests=( |
| 55 |
+ # Those tests are run separately |
| 56 |
+ pyftpdlib/test/test_misc.py |
| 57 |
# https://github.com/giampaolo/pyftpdlib/issues/470 |
| 58 |
# https://bugs.gentoo.org/659108 |
| 59 |
pyftpdlib/test/test_functional_ssl.py::TestTimeouts::test_idle_data_timeout2 |
| 60 |
@@ -62,8 +62,7 @@ python_test() { |
| 61 |
pyftpdlib/test/test_servers.py::TestFtpAuthentication::test_auth_failed |
| 62 |
) |
| 63 |
# Tests fail with TZ=GMT, see https://bugs.gentoo.org/666623 |
| 64 |
- TZ=UTC+1 pytest -vv \ |
| 65 |
- --ignore ${PN}/test/test_misc.py ${skipped_tests[@]/#/--deselect } \ |
| 66 |
+ TZ=UTC+1 pytest -vv ${skipped_tests[@]/#/--deselect } \ |
| 67 |
|| die "Tests failed with ${EPYTHON}" |
| 68 |
} |
| 69 |
|
| 70 |
@@ -75,12 +74,3 @@ python_install_all() { |
| 71 |
fi |
| 72 |
distutils-r1_python_install_all |
| 73 |
} |
| 74 |
- |
| 75 |
-pkg_postinst() { |
| 76 |
- if [[ -z ${REPLACING_VERSIONS} ]] && \ |
| 77 |
- [[ ${PYTHON_TARGETS} == *python2_7* ]] && \ |
| 78 |
- ! has_version dev-python/pysendfile ; then |
| 79 |
- elog "dev-python/pysendfile is not installed" |
| 80 |
- elog "It can considerably speed up file transfers for Python 2" |
| 81 |
- fi |
| 82 |
-} |
Archives