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/scikit-build/files/, dev-python/scikit-build/
Date: Sat, 18 Sep 2021 21:03:40
Message-Id: 1631998618.761660036b995d2993e534263b742a2bb6fc5f50.mgorny@gentoo
1 commit: 761660036b995d2993e534263b742a2bb6fc5f50
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 18 20:08:01 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 18 20:56:58 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76166003
7
8 dev-python/scikit-build: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/scikit-build/Manifest | 1 -
13 .../files/scikit-build-0.10.0-docs.patch | 19 --------
14 .../files/scikit-build-0.11.1-py310.patch | 28 ------------
15 dev-python/scikit-build/scikit-build-0.11.1.ebuild | 53 ----------------------
16 4 files changed, 101 deletions(-)
17
18 diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
19 index 9180ab42c1d..f65a3e93331 100644
20 --- a/dev-python/scikit-build/Manifest
21 +++ b/dev-python/scikit-build/Manifest
22 @@ -1,2 +1 @@
23 -DIST scikit-build-0.11.1.tar.gz 132025 BLAKE2B 0f818d8da896695ee0d6b046249e74cbd4ea643bec0515d6ac6ff4276d92430a1dbf81abb3b7c10890538c373225a45cc21b0906de891f1a5390226be914dacd SHA512 030c6cc727d39cbafd2865722de9c45ba2f13461461cf75019b9caf6afd0a776b4f598fa2ce102b5adbc770140ab1de2c33e2bbd3ef03c958ae8849e5fc26cb4
24 DIST scikit-build-0.12.0.tar.gz 138053 BLAKE2B 5007bd070cee14056cbc9cc24a022a39c920ce7fa794a79dcdb707f185529e1ed2442a201593f6df8d2dd9b4ab7a9a1ed209b0bc08f3feae748edd06894f8661 SHA512 76be92d8ff96dc230e38dc36a58021399dd8c57b6883dc032fbcd8f01ce42c879c6d557e7a46d48aa9b8bc724270f409f3760824d5810654b53a1aca25ec1cf9
25
26 diff --git a/dev-python/scikit-build/files/scikit-build-0.10.0-docs.patch b/dev-python/scikit-build/files/scikit-build-0.10.0-docs.patch
27 deleted file mode 100644
28 index f48ad934075..00000000000
29 --- a/dev-python/scikit-build/files/scikit-build-0.10.0-docs.patch
30 +++ /dev/null
31 @@ -1,19 +0,0 @@
32 -diff --git a/docs/conf.py b/docs/conf.py
33 -index 094ed23..a58cb85 100644
34 ---- a/docs/conf.py
35 -+++ b/docs/conf.py
36 -@@ -41,7 +41,6 @@ import skbuild
37 - # Add any Sphinx extension module names here, as strings. They can be
38 - # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
39 - extensions = [
40 -- 'cmake',
41 - 'sphinx.ext.autodoc',
42 - 'sphinx.ext.viewcode',
43 - 'sphinx_issues'
44 -@@ -291,4 +290,4 @@ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
45 - if not on_rtd: # only import and set the theme if we're building docs locally
46 - import sphinx_rtd_theme
47 - html_theme = 'sphinx_rtd_theme'
48 -- html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
49 -\ No newline at end of file
50 -+ html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
51
52 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
53 deleted file mode 100644
54 index fa00556f9ad..00000000000
55 --- a/dev-python/scikit-build/files/scikit-build-0.11.1-py310.patch
56 +++ /dev/null
57 @@ -1,28 +0,0 @@
58 -From c1677527af3f7afd48ebbe1b2338ac822f64c524 Mon Sep 17 00:00:00 2001
59 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
60 -Date: Sat, 19 Jun 2021 19:27:09 +0200
61 -Subject: [PATCH] fix: fix regex in test_get_python_version for Python 3.10
62 -
63 -Fix the regular expression in test_get_python_version to permit
64 -the minor version to contain more than one digit. This fixes the test
65 -on Python 3.10.
66 ----
67 - tests/test_cmaker.py | 2 +-
68 - 1 file changed, 1 insertion(+), 1 deletion(-)
69 -
70 -diff --git a/tests/test_cmaker.py b/tests/test_cmaker.py
71 -index d63059c..52d0028 100644
72 ---- a/tests/test_cmaker.py
73 -+++ b/tests/test_cmaker.py
74 -@@ -21,7 +21,7 @@ from . import _tmpdir, get_cmakecache_variables
75 -
76 -
77 - def test_get_python_version():
78 -- assert re.match(r'^[23](\.?)[0-9]$', CMaker.get_python_version())
79 -+ assert re.match(r'^[23](\.?)\d+$', CMaker.get_python_version())
80 -
81 -
82 - def test_get_python_include_dir():
83 ---
84 -2.32.0
85 -
86
87 diff --git a/dev-python/scikit-build/scikit-build-0.11.1.ebuild b/dev-python/scikit-build/scikit-build-0.11.1.ebuild
88 deleted file mode 100644
89 index 1d799fe0cd2..00000000000
90 --- a/dev-python/scikit-build/scikit-build-0.11.1.ebuild
91 +++ /dev/null
92 @@ -1,53 +0,0 @@
93 -# Copyright 1999-2021 Gentoo Authors
94 -# Distributed under the terms of the GNU General Public License v2
95 -
96 -EAPI=7
97 -
98 -PYTHON_COMPAT=( python3_{8..10} )
99 -
100 -inherit distutils-r1
101 -
102 -DESCRIPTION="Improved build system generator for Python C/C++/Fortran/Cython extensions"
103 -HOMEPAGE="https://github.com/scikit-build/scikit-build"
104 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
105 -
106 -SLOT="0"
107 -LICENSE="MIT"
108 -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
109 -
110 -RDEPEND="
111 - dev-python/distro[${PYTHON_USEDEP}]
112 - dev-python/packaging[${PYTHON_USEDEP}]
113 - dev-python/wheel[${PYTHON_USEDEP}]"
114 -
115 -DEPEND="
116 - test? (
117 - dev-python/cython[${PYTHON_USEDEP}]
118 - dev-python/path-py[${PYTHON_USEDEP}]
119 - dev-python/pytest-mock[${PYTHON_USEDEP}]
120 - dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
121 - dev-python/requests[${PYTHON_USEDEP}]
122 - dev-python/six[${PYTHON_USEDEP}]
123 - dev-python/virtualenv[${PYTHON_USEDEP}]
124 - )"
125 -
126 -PATCHES=(
127 - "${FILESDIR}/${PN}-0.10.0-docs.patch"
128 - "${FILESDIR}"/${P}-py310.patch
129 -)
130 -
131 -distutils_enable_sphinx docs \
132 - dev-python/sphinx_rtd_theme \
133 - dev-python/sphinx-issues
134 -distutils_enable_tests pytest
135 -
136 -python_test() {
137 - local deselect=(
138 - # sandbox violations
139 - tests/test_hello_cpp.py::test_hello_develop
140 - tests/test_issue274_support_default_package_dir.py
141 - tests/test_issue274_support_one_package_without_package_dir.py
142 - tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py
143 - )
144 - epytest ${deselect[@]/#/--deselect }
145 -}