[gentoo-commits] repo/gentoo:master commit in: dev-python/scikit-build/files/, dev-python/scikit-build/

[Michał Górny]

commit:     50a68a4760d3e65dfd19ad366e4b4fc6ca239701
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 19 17:29:33 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun 19 17:42:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50a68a47

dev-python/scikit-build: Enable py3.10

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

 .../files/scikit-build-0.11.1-py310.patch          | 28 ++++++++++++++++++++++
 dev-python/scikit-build/scikit-build-0.11.1.ebuild |  9 ++++---
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/dev-python/scikit-build/files/scikit-build-0.11.1-py310.patch b/dev-python/scikit-build/files/scikit-build-0.11.1-py310.patch
new file mode 100644
index 00000000000..fa00556f9ad
--- /dev/null
+++ b/dev-python/scikit-build/files/scikit-build-0.11.1-py310.patch
@@ -0,0 +1,28 @@
+From c1677527af3f7afd48ebbe1b2338ac822f64c524 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
+Date: Sat, 19 Jun 2021 19:27:09 +0200
+Subject: [PATCH] fix: fix regex in test_get_python_version for Python 3.10
+
+Fix the regular expression in test_get_python_version to permit
+the minor version to contain more than one digit.  This fixes the test
+on Python 3.10.
+---
+ tests/test_cmaker.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_cmaker.py b/tests/test_cmaker.py
+index d63059c..52d0028 100644
+--- a/tests/test_cmaker.py
++++ b/tests/test_cmaker.py
+@@ -21,7 +21,7 @@ from . import _tmpdir, get_cmakecache_variables
+ 
+ 
+ def test_get_python_version():
+-    assert re.match(r'^[23](\.?)[0-9]$', CMaker.get_python_version())
++    assert re.match(r'^[23](\.?)\d+$', CMaker.get_python_version())
+ 
+ 
+ def test_get_python_include_dir():
+-- 
+2.32.0
+

diff --git a/dev-python/scikit-build/scikit-build-0.11.1.ebuild b/dev-python/scikit-build/scikit-build-0.11.1.ebuild
index b65c6bdf689..bbebf508eb9 100644
--- a/dev-python/scikit-build/scikit-build-0.11.1.ebuild
+++ b/dev-python/scikit-build/scikit-build-0.11.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -32,7 +32,10 @@ DEPEND="
 		dev-python/virtualenv[${PYTHON_USEDEP}]
 	)"
 
-PATCHES=( "${FILESDIR}/${PN}-0.10.0-docs.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.10.0-docs.patch"
+	"${FILESDIR}"/${P}-py310.patch
+)
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme \