1 |
commit: 03c214b859b37ba9fa4d414be50967489a8d6363 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jun 24 14:13:00 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 29 17:49:22 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03c214b8 |
7 |
|
8 |
distutils-r1.eclass: Adjust minimal dep versions to current stable |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
eclass/distutils-r1.eclass | 48 +++++++++++++++++++++++++++++----------------- |
14 |
1 file changed, 30 insertions(+), 18 deletions(-) |
15 |
|
16 |
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass |
17 |
index ba21e3c43d92..85d6c8ae5080 100644 |
18 |
--- a/eclass/distutils-r1.eclass |
19 |
+++ b/eclass/distutils-r1.eclass |
20 |
@@ -205,27 +205,33 @@ _distutils_set_globals() { |
21 |
fi |
22 |
|
23 |
bdep=' |
24 |
- >=dev-python/gpep517-3[${PYTHON_USEDEP}]' |
25 |
+ >=dev-python/gpep517-6[${PYTHON_USEDEP}] |
26 |
+ ' |
27 |
case ${DISTUTILS_USE_PEP517} in |
28 |
flit) |
29 |
bdep+=' |
30 |
- >=dev-python/flit_core-3.7.1[${PYTHON_USEDEP}]' |
31 |
+ >=dev-python/flit_core-3.7.1[${PYTHON_USEDEP}] |
32 |
+ ' |
33 |
;; |
34 |
flit_scm) |
35 |
bdep+=' |
36 |
- dev-python/flit_scm[${PYTHON_USEDEP}]' |
37 |
+ dev-python/flit_scm[${PYTHON_USEDEP}] |
38 |
+ ' |
39 |
;; |
40 |
hatchling) |
41 |
bdep+=' |
42 |
- >=dev-python/hatchling-0.22.0[${PYTHON_USEDEP}]' |
43 |
+ >=dev-python/hatchling-1.3.1[${PYTHON_USEDEP}] |
44 |
+ ' |
45 |
;; |
46 |
jupyter) |
47 |
bdep+=' |
48 |
- >=dev-python/jupyter_packaging-0.11.1[${PYTHON_USEDEP}]' |
49 |
+ >=dev-python/jupyter_packaging-0.12.0-r1[${PYTHON_USEDEP}] |
50 |
+ ' |
51 |
;; |
52 |
maturin) |
53 |
bdep+=' |
54 |
- >=dev-util/maturin-0.12.7[${PYTHON_USEDEP}]' |
55 |
+ >=dev-util/maturin-0.12.17[${PYTHON_USEDEP}] |
56 |
+ ' |
57 |
;; |
58 |
no) |
59 |
# undo the generic deps added above |
60 |
@@ -233,28 +239,34 @@ _distutils_set_globals() { |
61 |
;; |
62 |
meson-python) |
63 |
bdep+=' |
64 |
- dev-python/meson-python[${PYTHON_USEDEP}]' |
65 |
+ dev-python/meson-python[${PYTHON_USEDEP}] |
66 |
+ ' |
67 |
;; |
68 |
pbr) |
69 |
bdep+=' |
70 |
- >=dev-python/pbr-5.8.0-r1[${PYTHON_USEDEP}]' |
71 |
+ >=dev-python/pbr-5.8.0-r1[${PYTHON_USEDEP}] |
72 |
+ ' |
73 |
;; |
74 |
pdm) |
75 |
bdep+=' |
76 |
- >=dev-python/pdm-pep517-0.12.3[${PYTHON_USEDEP}]' |
77 |
+ >=dev-python/pdm-pep517-1.0.0[${PYTHON_USEDEP}] |
78 |
+ ' |
79 |
;; |
80 |
poetry) |
81 |
bdep+=' |
82 |
- >=dev-python/poetry-core-1.0.8[${PYTHON_USEDEP}]' |
83 |
+ >=dev-python/poetry-core-1.0.8[${PYTHON_USEDEP}] |
84 |
+ ' |
85 |
;; |
86 |
setuptools) |
87 |
bdep+=' |
88 |
- >=dev-python/setuptools-60.5.0[${PYTHON_USEDEP}] |
89 |
- dev-python/wheel[${PYTHON_USEDEP}]' |
90 |
+ >=dev-python/setuptools-62.3.3[${PYTHON_USEDEP}] |
91 |
+ dev-python/wheel[${PYTHON_USEDEP}] |
92 |
+ ' |
93 |
;; |
94 |
sip) |
95 |
bdep+=' |
96 |
- >=dev-python/sip-6.5.0-r1[${PYTHON_USEDEP}]' |
97 |
+ >=dev-python/sip-6.5.0-r1[${PYTHON_USEDEP}] |
98 |
+ ' |
99 |
;; |
100 |
standalone) |
101 |
;; |
102 |
@@ -473,7 +485,7 @@ distutils_enable_sphinx() { |
103 |
_DISTUTILS_SPHINX_PLUGINS=( "${@}" ) |
104 |
|
105 |
local deps autodoc=1 d |
106 |
- deps=">=dev-python/sphinx-4.4.0[\${PYTHON_USEDEP}]" |
107 |
+ deps=">=dev-python/sphinx-4.5.0-r1[\${PYTHON_USEDEP}]" |
108 |
for d; do |
109 |
if [[ ${d} == --no-autodoc ]]; then |
110 |
autodoc= |
111 |
@@ -497,7 +509,7 @@ distutils_enable_sphinx() { |
112 |
use doc || return 0 |
113 |
|
114 |
local p |
115 |
- for p in ">=dev-python/sphinx-4.4.0" \ |
116 |
+ for p in ">=dev-python/sphinx-4.5.0-r1" \ |
117 |
"${_DISTUTILS_SPHINX_PLUGINS[@]}" |
118 |
do |
119 |
python_has_version "${p}[${PYTHON_USEDEP}]" || |
120 |
@@ -505,7 +517,7 @@ distutils_enable_sphinx() { |
121 |
done |
122 |
} |
123 |
else |
124 |
- deps=">=dev-python/sphinx-4.4.0" |
125 |
+ deps=">=dev-python/sphinx-4.5.0-r1" |
126 |
fi |
127 |
|
128 |
sphinx_compile_all() { |
129 |
@@ -585,10 +597,10 @@ distutils_enable_tests() { |
130 |
local test_pkg |
131 |
case ${1} in |
132 |
nose) |
133 |
- test_pkg=">=dev-python/nose-1.3.7-r4" |
134 |
+ test_pkg=">=dev-python/nose-1.3.7_p20211111_p1-r1" |
135 |
;; |
136 |
pytest) |
137 |
- test_pkg=">=dev-python/pytest-7.0.1" |
138 |
+ test_pkg=">=dev-python/pytest-7.1.2" |
139 |
;; |
140 |
setup.py) |
141 |
;; |