1 |
commit: 3b7907c5803f3cff8448cb739325678bbbc9b828 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 3 20:46:17 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 3 20:46:17 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b7907c5 |
7 |
|
8 |
dev-python/pytest: Remove python_gen_cond_dep calls for py3.5 |
9 |
|
10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
12 |
|
13 |
dev-python/pytest/pytest-3.10.1.ebuild | 6 +++--- |
14 |
dev-python/pytest/pytest-4.5.0.ebuild | 2 +- |
15 |
dev-python/pytest/pytest-4.6.6.ebuild | 4 ++-- |
16 |
dev-python/pytest/pytest-4.6.7.ebuild | 6 +++--- |
17 |
dev-python/pytest/pytest-4.6.8.ebuild | 4 ++-- |
18 |
dev-python/pytest/pytest-5.3.0.ebuild | 3 +-- |
19 |
dev-python/pytest/pytest-5.3.1.ebuild | 3 +-- |
20 |
dev-python/pytest/pytest-5.3.2.ebuild | 3 +-- |
21 |
8 files changed, 14 insertions(+), 17 deletions(-) |
22 |
|
23 |
diff --git a/dev-python/pytest/pytest-3.10.1.ebuild b/dev-python/pytest/pytest-3.10.1.ebuild |
24 |
index 551cebba719..743c17f71e9 100644 |
25 |
--- a/dev-python/pytest/pytest-3.10.1.ebuild |
26 |
+++ b/dev-python/pytest/pytest-3.10.1.ebuild |
27 |
@@ -1,4 +1,4 @@ |
28 |
-# Copyright 1999-2019 Gentoo Authors |
29 |
+# Copyright 1999-2020 Gentoo Authors |
30 |
# Distributed under the terms of the GNU General Public License v2 |
31 |
|
32 |
EAPI=7 |
33 |
@@ -27,8 +27,8 @@ RDEPEND=" |
34 |
>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}] |
35 |
$(python_gen_cond_dep '>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python2_7 ) |
36 |
$(python_gen_cond_dep '<dev-python/more-itertools-6.0.0[${PYTHON_USEDEP}]' python2_7 ) |
37 |
- $(python_gen_cond_dep '>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python3_{5,6,7} pypy{,3} ) |
38 |
- $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_5 ) |
39 |
+ $(python_gen_cond_dep '>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python3_{6,7} pypy{,3} ) |
40 |
+ $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7) |
41 |
>=dev-python/pluggy-0.7[${PYTHON_USEDEP}] |
42 |
>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}] |
43 |
>=dev-python/setuptools-40[${PYTHON_USEDEP}] |
44 |
|
45 |
diff --git a/dev-python/pytest/pytest-4.5.0.ebuild b/dev-python/pytest/pytest-4.5.0.ebuild |
46 |
index e5795dd521d..7e4a0403ce2 100644 |
47 |
--- a/dev-python/pytest/pytest-4.5.0.ebuild |
48 |
+++ b/dev-python/pytest/pytest-4.5.0.ebuild |
49 |
@@ -26,7 +26,7 @@ RDEPEND=" |
50 |
>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}] |
51 |
>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}] |
52 |
>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] |
53 |
- $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_5 ) |
54 |
+ $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7) |
55 |
>=dev-python/pluggy-0.11[${PYTHON_USEDEP}] |
56 |
<dev-python/pluggy-1 |
57 |
>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}] |
58 |
|
59 |
diff --git a/dev-python/pytest/pytest-4.6.6.ebuild b/dev-python/pytest/pytest-4.6.6.ebuild |
60 |
index 4f85c1855b6..00edbafb327 100644 |
61 |
--- a/dev-python/pytest/pytest-4.6.6.ebuild |
62 |
+++ b/dev-python/pytest/pytest-4.6.6.ebuild |
63 |
@@ -1,4 +1,4 @@ |
64 |
-# Copyright 1999-2019 Gentoo Authors |
65 |
+# Copyright 1999-2020 Gentoo Authors |
66 |
# Distributed under the terms of the GNU General Public License v2 |
67 |
|
68 |
EAPI=7 |
69 |
@@ -28,7 +28,7 @@ RDEPEND=" |
70 |
>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] |
71 |
$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' \ |
72 |
-2 python3_{5,6,7} pypy3) |
73 |
- $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2 python3_5) |
74 |
+ $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2) |
75 |
>=dev-python/pluggy-0.12[${PYTHON_USEDEP}] |
76 |
<dev-python/pluggy-1 |
77 |
>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}] |
78 |
|
79 |
diff --git a/dev-python/pytest/pytest-4.6.7.ebuild b/dev-python/pytest/pytest-4.6.7.ebuild |
80 |
index 4f85c1855b6..0efddd35ef8 100644 |
81 |
--- a/dev-python/pytest/pytest-4.6.7.ebuild |
82 |
+++ b/dev-python/pytest/pytest-4.6.7.ebuild |
83 |
@@ -1,4 +1,4 @@ |
84 |
-# Copyright 1999-2019 Gentoo Authors |
85 |
+# Copyright 1999-2020 Gentoo Authors |
86 |
# Distributed under the terms of the GNU General Public License v2 |
87 |
|
88 |
EAPI=7 |
89 |
@@ -27,8 +27,8 @@ RDEPEND=" |
90 |
>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}] |
91 |
>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] |
92 |
$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' \ |
93 |
- -2 python3_{5,6,7} pypy3) |
94 |
- $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2 python3_5) |
95 |
+ -2 python3_{6,7} pypy3) |
96 |
+ $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2) |
97 |
>=dev-python/pluggy-0.12[${PYTHON_USEDEP}] |
98 |
<dev-python/pluggy-1 |
99 |
>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}] |
100 |
|
101 |
diff --git a/dev-python/pytest/pytest-4.6.8.ebuild b/dev-python/pytest/pytest-4.6.8.ebuild |
102 |
index 4f85c1855b6..00edbafb327 100644 |
103 |
--- a/dev-python/pytest/pytest-4.6.8.ebuild |
104 |
+++ b/dev-python/pytest/pytest-4.6.8.ebuild |
105 |
@@ -1,4 +1,4 @@ |
106 |
-# Copyright 1999-2019 Gentoo Authors |
107 |
+# Copyright 1999-2020 Gentoo Authors |
108 |
# Distributed under the terms of the GNU General Public License v2 |
109 |
|
110 |
EAPI=7 |
111 |
@@ -28,7 +28,7 @@ RDEPEND=" |
112 |
>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] |
113 |
$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' \ |
114 |
-2 python3_{5,6,7} pypy3) |
115 |
- $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2 python3_5) |
116 |
+ $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2) |
117 |
>=dev-python/pluggy-0.12[${PYTHON_USEDEP}] |
118 |
<dev-python/pluggy-1 |
119 |
>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}] |
120 |
|
121 |
diff --git a/dev-python/pytest/pytest-5.3.0.ebuild b/dev-python/pytest/pytest-5.3.0.ebuild |
122 |
index 9795396ca68..87b412ee446 100644 |
123 |
--- a/dev-python/pytest/pytest-5.3.0.ebuild |
124 |
+++ b/dev-python/pytest/pytest-5.3.0.ebuild |
125 |
@@ -1,4 +1,4 @@ |
126 |
-# Copyright 1999-2019 Gentoo Authors |
127 |
+# Copyright 1999-2020 Gentoo Authors |
128 |
# Distributed under the terms of the GNU General Public License v2 |
129 |
|
130 |
EAPI=7 |
131 |
@@ -27,7 +27,6 @@ RDEPEND=" |
132 |
dev-python/importlib_metadata[${PYTHON_USEDEP}] |
133 |
>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] |
134 |
dev-python/packaging[${PYTHON_USEDEP}] |
135 |
- $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python3_5 ) |
136 |
>=dev-python/pluggy-0.12[${PYTHON_USEDEP}] |
137 |
<dev-python/pluggy-1 |
138 |
>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}] |
139 |
|
140 |
diff --git a/dev-python/pytest/pytest-5.3.1.ebuild b/dev-python/pytest/pytest-5.3.1.ebuild |
141 |
index 9795396ca68..87b412ee446 100644 |
142 |
--- a/dev-python/pytest/pytest-5.3.1.ebuild |
143 |
+++ b/dev-python/pytest/pytest-5.3.1.ebuild |
144 |
@@ -1,4 +1,4 @@ |
145 |
-# Copyright 1999-2019 Gentoo Authors |
146 |
+# Copyright 1999-2020 Gentoo Authors |
147 |
# Distributed under the terms of the GNU General Public License v2 |
148 |
|
149 |
EAPI=7 |
150 |
@@ -27,7 +27,6 @@ RDEPEND=" |
151 |
dev-python/importlib_metadata[${PYTHON_USEDEP}] |
152 |
>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] |
153 |
dev-python/packaging[${PYTHON_USEDEP}] |
154 |
- $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python3_5 ) |
155 |
>=dev-python/pluggy-0.12[${PYTHON_USEDEP}] |
156 |
<dev-python/pluggy-1 |
157 |
>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}] |
158 |
|
159 |
diff --git a/dev-python/pytest/pytest-5.3.2.ebuild b/dev-python/pytest/pytest-5.3.2.ebuild |
160 |
index 76a95d4f3d7..835e9d7c96e 100644 |
161 |
--- a/dev-python/pytest/pytest-5.3.2.ebuild |
162 |
+++ b/dev-python/pytest/pytest-5.3.2.ebuild |
163 |
@@ -1,4 +1,4 @@ |
164 |
-# Copyright 1999-2019 Gentoo Authors |
165 |
+# Copyright 1999-2020 Gentoo Authors |
166 |
# Distributed under the terms of the GNU General Public License v2 |
167 |
|
168 |
EAPI=7 |
169 |
@@ -27,7 +27,6 @@ RDEPEND=" |
170 |
dev-python/importlib_metadata[${PYTHON_USEDEP}] |
171 |
>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] |
172 |
dev-python/packaging[${PYTHON_USEDEP}] |
173 |
- $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python3_5 ) |
174 |
>=dev-python/pluggy-0.12[${PYTHON_USEDEP}] |
175 |
<dev-python/pluggy-1 |
176 |
>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}] |