Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pyopenssl/
Date: Thu, 12 May 2022 16:17:16
Message-Id: 1652372217.bf295c37adb3d9d0c63b16838d35a861890c1757.mgorny@gentoo
1 commit: bf295c37adb3d9d0c63b16838d35a861890c1757
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 12 14:22:10 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu May 12 16:16:57 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf295c37
7
8 dev-python/pyopenssl: Enable py3.11
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/pyopenssl/pyopenssl-20.0.1-r1.ebuild | 7 ++++---
13 dev-python/pyopenssl/pyopenssl-22.0.0.ebuild | 27 +++++++++++--------------
14 2 files changed, 16 insertions(+), 18 deletions(-)
15
16 diff --git a/dev-python/pyopenssl/pyopenssl-20.0.1-r1.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.1-r1.ebuild
17 index 70032fc7f99a..4421620872a3 100644
18 --- a/dev-python/pyopenssl/pyopenssl-20.0.1-r1.ebuild
19 +++ b/dev-python/pyopenssl/pyopenssl-20.0.1-r1.ebuild
20 @@ -4,7 +4,7 @@
21 EAPI=8
22
23 DISTUTILS_USE_PEP517=setuptools
24 -PYTHON_COMPAT=( python3_{8..10} pypy3 )
25 +PYTHON_COMPAT=( python3_{8..11} pypy3 )
26 PYTHON_REQ_USE="threads(+)"
27
28 inherit distutils-r1 toolchain-funcs
29 @@ -31,10 +31,11 @@ RDEPEND="
30 "
31 BDEPEND="
32 test? (
33 - virtual/python-cffi[${PYTHON_USEDEP}]
34 + $(python_gen_cond_dep '
35 + dev-python/cffi[${PYTHON_USEDEP}]
36 + ' 'python*')
37 dev-python/flaky[${PYTHON_USEDEP}]
38 dev-python/pretend[${PYTHON_USEDEP}]
39 - >=dev-python/pytest-3.0.1[${PYTHON_USEDEP}]
40 )
41 "
42
43
44 diff --git a/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild
45 index c2f361933d05..cb66675d0746 100644
46 --- a/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild
47 +++ b/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild
48 @@ -4,13 +4,14 @@
49 EAPI=8
50
51 DISTUTILS_USE_PEP517=setuptools
52 -PYTHON_COMPAT=( python3_{8..10} pypy3 )
53 +PYTHON_COMPAT=( python3_{8..11} pypy3 )
54 PYTHON_REQ_USE="threads(+)"
55
56 inherit distutils-r1 toolchain-funcs
57
58 MY_PN=pyOpenSSL
59 MY_P=${MY_PN}-${PV}
60 +
61 DESCRIPTION="Python interface to the OpenSSL library"
62 HOMEPAGE="
63 https://www.pyopenssl.org/
64 @@ -41,7 +42,12 @@ distutils_enable_sphinx doc \
65 dev-python/sphinx_rtd_theme
66 distutils_enable_tests pytest
67
68 -src_configure() {
69 +src_test() {
70 + local -x TZ=UTC
71 + local EPYTEST_DESELECT=(
72 + tests/test_ssl.py::TestContext::test_set_default_verify_paths
73 + )
74 +
75 # test for 32-bit time_t
76 "$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null <<-EOF &>/dev/null
77 #include <sys/types.h>
78 @@ -49,22 +55,13 @@ src_configure() {
79 EOF
80
81 if [[ ${?} -eq 0 ]]; then
82 - PYOPENSSL_SKIP_LARGE_TIME=
83 einfo "time_t is at least 64-bit long"
84 else
85 - PYOPENSSL_SKIP_LARGE_TIME=1
86 einfo "time_t is smaller than 64 bits, will skip broken tests"
87 + EPYTEST_DESELECT+=(
88 + tests/test_crypto.py::TestX509StoreContext::test_verify_with_time
89 + )
90 fi
91 -}
92 -
93 -python_test() {
94 - local -x TZ=UTC
95 - local EPYTEST_DESELECT=(
96 - tests/test_ssl.py::TestContext::test_set_default_verify_paths
97 - )
98 - [[ ${PYOPENSSL_SKIP_LARGE_TIME} ]] && EPYTEST_DESELECT+=(
99 - tests/test_crypto.py::TestX509StoreContext::test_verify_with_time
100 - )
101
102 - epytest
103 + distutils-r1_src_test
104 }