[gentoo-commits] repo/gentoo:master commit in: dev-python/pyopenssl/

[Michał Górny]

commit:     bf295c37adb3d9d0c63b16838d35a861890c1757
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 12 14:22:10 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 12 16:16:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf295c37

dev-python/pyopenssl: Enable py3.11

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pyopenssl/pyopenssl-20.0.1-r1.ebuild |  7 ++++---
 dev-python/pyopenssl/pyopenssl-22.0.0.ebuild    | 27 +++++++++++--------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/dev-python/pyopenssl/pyopenssl-20.0.1-r1.ebuild 
b/dev-python/pyopenssl/pyopenssl-20.0.1-r1.ebuild
index 70032fc7f99a..4421620872a3 100644
--- a/dev-python/pyopenssl/pyopenssl-20.0.1-r1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-20.0.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 toolchain-funcs
@@ -31,10 +31,11 @@ RDEPEND="
 "
 BDEPEND="
        test? (
-               virtual/python-cffi[${PYTHON_USEDEP}]
+               $(python_gen_cond_dep '
+                       dev-python/cffi[${PYTHON_USEDEP}]
+               ' 'python*')
                dev-python/flaky[${PYTHON_USEDEP}]
                dev-python/pretend[${PYTHON_USEDEP}]
-               >=dev-python/pytest-3.0.1[${PYTHON_USEDEP}]
        )
 "
 

diff --git a/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild 
b/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild
index c2f361933d05..cb66675d0746 100644
--- a/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild
@@ -4,13 +4,14 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 toolchain-funcs
 
 MY_PN=pyOpenSSL
 MY_P=${MY_PN}-${PV}
+
 DESCRIPTION="Python interface to the OpenSSL library"
 HOMEPAGE="
        https://www.pyopenssl.org/
@@ -41,7 +42,12 @@ distutils_enable_sphinx doc \
        dev-python/sphinx_rtd_theme
 distutils_enable_tests pytest
 
-src_configure() {
+src_test() {
+       local -x TZ=UTC
+       local EPYTEST_DESELECT=(
+               tests/test_ssl.py::TestContext::test_set_default_verify_paths
+       )
+
        # test for 32-bit time_t
        "$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null <<-EOF 
&>/dev/null
                #include <sys/types.h>
@@ -49,22 +55,13 @@ src_configure() {
        EOF
 
        if [[ ${?} -eq 0 ]]; then
-               PYOPENSSL_SKIP_LARGE_TIME=
                einfo "time_t is at least 64-bit long"
        else
-               PYOPENSSL_SKIP_LARGE_TIME=1
                einfo "time_t is smaller than 64 bits, will skip broken tests"
+               EPYTEST_DESELECT+=(
+                       
tests/test_crypto.py::TestX509StoreContext::test_verify_with_time
+               )
        fi
-}
-
-python_test() {
-       local -x TZ=UTC
-       local EPYTEST_DESELECT=(
-               tests/test_ssl.py::TestContext::test_set_default_verify_paths
-       )
-       [[ ${PYOPENSSL_SKIP_LARGE_TIME} ]] && EPYTEST_DESELECT+=(
-               
tests/test_crypto.py::TestX509StoreContext::test_verify_with_time
-       )
 
-       epytest
+       distutils-r1_src_test
 }