diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-06-20 14:45:01 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-06-20 14:45:01 +0100 |
commit | 34dea8e38f88007799629d0a56b12dec480b1d21 (patch) | |
tree | 6790873994b58030360328cf5897d934b3b03d16 /dev-python/scikit-build | |
parent | 7932d472a02d4c016ff7dff4b7a5479ab9d1883d (diff) |
gentoo resync : 20.06.2021
Diffstat (limited to 'dev-python/scikit-build')
-rw-r--r-- | dev-python/scikit-build/Manifest | 3 | ||||
-rw-r--r-- | dev-python/scikit-build/files/scikit-build-0.11.1-py310.patch | 28 | ||||
-rw-r--r-- | dev-python/scikit-build/scikit-build-0.11.1.ebuild | 9 |
3 files changed, 36 insertions, 4 deletions
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest index e1de24f38a93..724fec76febc 100644 --- a/dev-python/scikit-build/Manifest +++ b/dev-python/scikit-build/Manifest @@ -1,4 +1,5 @@ AUX scikit-build-0.10.0-docs.patch 773 BLAKE2B 27303cb8ff439dbf9e44454ed58cffc2cbba53fd639b830e03707fce7aca0749018caac72891c3efa0b66b3830001634ca9e2cd34c769f625d2f735f5c1d4dcd SHA512 d6920e22ec20feec99768d09b3a01244eb6bf079b4d68c0eda1a17d04c640c7b5df6685c883812e7c9bf5455d6c5a8248a503f466db23da82d45b5ba53188252 +AUX scikit-build-0.11.1-py310.patch 915 BLAKE2B 8ae5eb217482f0dfbcf966bbee65e9e2e2d7e74bff1970b6417789ca5c93881958640213ffe6c496a4a7f6578101fb51976528474cb3c8147302ec9221d9d1be SHA512 98bac74f6715320666be75455515efe35b208bc26209323453589cfb0c83ece5acefcaa5d17f625dd9ebb5970c06a3ba69334d140525d6b944066e50efdce22e DIST scikit-build-0.11.1.tar.gz 132025 BLAKE2B 0f818d8da896695ee0d6b046249e74cbd4ea643bec0515d6ac6ff4276d92430a1dbf81abb3b7c10890538c373225a45cc21b0906de891f1a5390226be914dacd SHA512 030c6cc727d39cbafd2865722de9c45ba2f13461461cf75019b9caf6afd0a776b4f598fa2ce102b5adbc770140ab1de2c33e2bbd3ef03c958ae8849e5fc26cb4 -EBUILD scikit-build-0.11.1.ebuild 1462 BLAKE2B 0058ba36d58ba01c8b0d6b88c5d18de2f6eb0ee3478825d5e03a024fd806217e4ba6a07d23320a9f3dfdf7c4f22783683463df96e575d56e25f947fed7296b61 SHA512 ee79e20d1c0ac08e72fad1b88d0385bd2bd6bedc36fd35cd77d9194bbfcd39adae056cb69fd4c8bb29d6494e75e7ba6d379fcb9606a97a5d086b222182dff117 +EBUILD scikit-build-0.11.1.ebuild 1496 BLAKE2B 3eaebe868dd25c1882b2ef22800c7c82d63f0fb291652b77ccc2821c3b9e2c3ebb6440472184ce088c779621b5b6556546bfc0925e658130aa5221af2d1a2f67 SHA512 0bb1db3ad5682d02d00809df3e0fa253618e97acd4f388f0c06ac029f49590e23a538f10393891c1c45ffa69af6713fa174ced3dabd07e6f8c0cff1be6322c50 MISC metadata.xml 407 BLAKE2B 91cafd558c8797a07a57e8581fe68b3353d6f70a00dbfda9ce1615fc5302f9cce23a806fc31f4359f670546a39a97ddd7958d0fd77ab6d18841f3888bdbda0c2 SHA512 2a06667260d774bf4e49553c709110b14e798cbe4641352c745c5af6e400bf027d1064997b5347e4ffadc27310dfe0bd02a58a891defd6d7cd96f1b2ed3909e0 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 000000000000..fa00556f9add --- /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@gentoo.org> +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 b65c6bdf6891..bbebf508eb95 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 \ |