From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 37CD7138359 for ; Thu, 10 Sep 2020 21:08:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6165FE090E; Thu, 10 Sep 2020 21:08:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 43499E090E for ; Thu, 10 Sep 2020 21:08:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EB031340791 for ; Thu, 10 Sep 2020 21:08:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A3E8832C for ; Thu, 10 Sep 2020 21:08:34 +0000 (UTC) From: "Louis Sautier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Louis Sautier" Message-ID: <1599772071.d2a8804c3475b6dda967ece362f51ccb24fc0fd9.sbraz@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pyftpdlib/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild X-VCS-Directories: dev-python/pyftpdlib/ X-VCS-Committer: sbraz X-VCS-Committer-Name: Louis Sautier X-VCS-Revision: d2a8804c3475b6dda967ece362f51ccb24fc0fd9 X-VCS-Branch: master Date: Thu, 10 Sep 2020 21:08:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 98ceffdf-71c5-448c-a7d5-7c3e8f7d52e4 X-Archives-Hash: 832e54744b099bb10e9f62edee7a7b21 commit: d2a8804c3475b6dda967ece362f51ccb24fc0fd9 Author: Louis Sautier gentoo org> AuthorDate: Thu Sep 10 20:35:42 2020 +0000 Commit: Louis Sautier gentoo org> CommitDate: Thu Sep 10 21:07:51 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2a8804c dev-python/pyftpdlib: support Py3.9, remove unnecessary deps Also make python_test slightly prettier and remove the explicit setuptools dependency. Package-Manager: Portage-3.0.6, Repoman-3.0.1 Signed-off-by: Louis Sautier gentoo.org> ...dlib-1.5.6.ebuild => pyftpdlib-1.5.6-r1.ebuild} | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild similarity index 83% rename from dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild rename to dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild index ef5525f50ad..c98a11ff049 100644 --- a/dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild +++ b/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) + +PYTHON_COMPAT=( python3_{6,7,8,9} ) PYTHON_REQ_USE="ssl(+)" inherit distutils-r1 @@ -19,13 +20,10 @@ RESTRICT="!test? ( test )" RDEPEND=" ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] ) - dev-python/pysendfile[${PYTHON_USEDEP}] " -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] +BDEPEND=" test? ( ${RDEPEND} - dev-python/mock[${PYTHON_USEDEP}] dev-python/psutil[${PYTHON_USEDEP}] dev-python/pyopenssl[${PYTHON_USEDEP}] dev-python/pytest[${PYTHON_USEDEP}] @@ -40,6 +38,8 @@ python_test() { pytest ${PN}/test/test_misc.py || die "Tests failed with ${EPYTHON}" # Some of these tests tend to fail local skipped_tests=( + # Those tests are run separately + pyftpdlib/test/test_misc.py # https://github.com/giampaolo/pyftpdlib/issues/470 # https://bugs.gentoo.org/659108 pyftpdlib/test/test_functional_ssl.py::TestTimeouts::test_idle_data_timeout2 @@ -62,8 +62,7 @@ python_test() { pyftpdlib/test/test_servers.py::TestFtpAuthentication::test_auth_failed ) # Tests fail with TZ=GMT, see https://bugs.gentoo.org/666623 - TZ=UTC+1 pytest -vv \ - --ignore ${PN}/test/test_misc.py ${skipped_tests[@]/#/--deselect } \ + TZ=UTC+1 pytest -vv ${skipped_tests[@]/#/--deselect } \ || die "Tests failed with ${EPYTHON}" } @@ -75,12 +74,3 @@ python_install_all() { fi distutils-r1_python_install_all } - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]] && \ - [[ ${PYTHON_TARGETS} == *python2_7* ]] && \ - ! has_version dev-python/pysendfile ; then - elog "dev-python/pysendfile is not installed" - elog "It can considerably speed up file transfers for Python 2" - fi -}