1 |
commit: 75ff0a7a3f85b857de29c22ca735ed02310c2c7d |
2 |
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 27 13:51:26 2019 +0000 |
4 |
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 27 14:10:11 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75ff0a7a |
7 |
|
8 |
dev-python/pyftpdlib: add Python 3.8, skip more failing tests |
9 |
|
10 |
Also: |
11 |
* switch to distutils_enable_sphinx |
12 |
* add RESTRICT="!test? ( test )" |
13 |
|
14 |
Closes: https://bugs.gentoo.org/701146 |
15 |
Package-Manager: Portage-2.3.79, Repoman-2.3.18 |
16 |
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org> |
17 |
|
18 |
...dlib-1.5.5.ebuild => pyftpdlib-1.5.5-r1.ebuild} | 35 ++++++++-------------- |
19 |
1 file changed, 13 insertions(+), 22 deletions(-) |
20 |
|
21 |
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.5.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.5-r1.ebuild |
22 |
similarity index 70% |
23 |
rename from dev-python/pyftpdlib/pyftpdlib-1.5.5.ebuild |
24 |
rename to dev-python/pyftpdlib/pyftpdlib-1.5.5-r1.ebuild |
25 |
index 7d37efe8f96..a54faca32ab 100644 |
26 |
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.5.ebuild |
27 |
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.5-r1.ebuild |
28 |
@@ -2,7 +2,7 @@ |
29 |
# Distributed under the terms of the GNU General Public License v2 |
30 |
|
31 |
EAPI=7 |
32 |
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) |
33 |
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} ) |
34 |
PYTHON_REQ_USE="ssl(+)" |
35 |
|
36 |
inherit distutils-r1 |
37 |
@@ -14,7 +14,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
38 |
LICENSE="MIT" |
39 |
SLOT="0" |
40 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris" |
41 |
-IUSE="doc examples ssl test" |
42 |
+IUSE="examples ssl test" |
43 |
+RESTRICT="!test? ( test )" |
44 |
|
45 |
RDEPEND=" |
46 |
ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] ) |
47 |
@@ -22,10 +23,6 @@ RDEPEND=" |
48 |
" |
49 |
DEPEND=" |
50 |
dev-python/setuptools[${PYTHON_USEDEP}] |
51 |
- doc? ( |
52 |
- dev-python/sphinx[${PYTHON_USEDEP}] |
53 |
- dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] |
54 |
- ) |
55 |
test? ( |
56 |
${RDEPEND} |
57 |
dev-python/mock[${PYTHON_USEDEP}] |
58 |
@@ -35,17 +32,7 @@ DEPEND=" |
59 |
) |
60 |
" |
61 |
|
62 |
-python_prepare_all() { |
63 |
- sed -i "s/'sphinx.ext.intersphinx'//" docs/conf.py || die |
64 |
- distutils-r1_python_prepare_all |
65 |
-} |
66 |
- |
67 |
-python_compile_all() { |
68 |
- if use doc; then |
69 |
- sphinx-build docs docs/_build/html || die |
70 |
- HTML_DOCS=( docs/_build/html/. ) |
71 |
- fi |
72 |
-} |
73 |
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme |
74 |
|
75 |
python_test() { |
76 |
# These tests fail when passing additional options to pytest |
77 |
@@ -55,18 +42,22 @@ python_test() { |
78 |
local skipped_tests=( |
79 |
# https://github.com/giampaolo/pyftpdlib/issues/470 |
80 |
# https://bugs.gentoo.org/659108 |
81 |
- test_idle_data_timeout2 |
82 |
+ pyftpdlib/test/test_functional_ssl.py::TestTimeouts::test_idle_data_timeout2 |
83 |
+ pyftpdlib/test/test_functional_ssl.py::TestTimeoutsTLSMixin::test_idle_data_timeout2 |
84 |
# https://github.com/giampaolo/pyftpdlib/issues/471 |
85 |
# https://bugs.gentoo.org/636410 |
86 |
- test_on_incomplete_file_received |
87 |
+ pyftpdlib/test/test_functional.py::TestCallbacks::test_on_incomplete_file_received |
88 |
# https://github.com/giampaolo/pyftpdlib/issues/466 |
89 |
# https://bugs.gentoo.org/659786 |
90 |
- test_nlst |
91 |
+ pyftpdlib/test/test_functional_ssl.py::TestFtpListingCmdsTLSMixin::test_nlst |
92 |
+ # https://github.com/giampaolo/pyftpdlib/issues/512 |
93 |
+ # https://bugs.gentoo.org/701146 |
94 |
+ pyftpdlib/test/test_functional_ssl.py::TestFtpStoreDataTLSMixin::test_rest_on_stor |
95 |
+ pyftpdlib/test/test_functional_ssl.py::TestFtpStoreDataTLSMixin::test_stor_as cii |
96 |
) |
97 |
- skipped_tests=${skipped_tests[@]/%/ or} |
98 |
# Tests fail with TZ=GMT, see https://bugs.gentoo.org/666623 |
99 |
TZ=UTC+1 pytest -vv \ |
100 |
- --ignore ${PN}/test/test_misc.py -k "not (${skipped_tests% or})" \ |
101 |
+ --ignore ${PN}/test/test_misc.py ${skipped_tests[@]/#/--deselect } \ |
102 |
|| die "Tests failed with ${EPYTHON}" |
103 |
} |