1 |
commit: cb75de184c84b8de4c60fd2f322752371243174c |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 10 12:52:50 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 10 14:35:58 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb75de18 |
7 |
|
8 |
dev-python/setuptools_scm: Drop old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/setuptools_scm/Manifest | 4 - |
13 |
.../files/setuptools_scm-3.1.0-test-failures.patch | 105 --------------------- |
14 |
.../setuptools_scm/setuptools_scm-1.16.1.ebuild | 37 -------- |
15 |
.../setuptools_scm/setuptools_scm-2.1.0.ebuild | 38 -------- |
16 |
.../setuptools_scm/setuptools_scm-3.1.0.ebuild | 43 --------- |
17 |
.../setuptools_scm/setuptools_scm-3.3.0.ebuild | 39 -------- |
18 |
6 files changed, 266 deletions(-) |
19 |
|
20 |
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest |
21 |
index 6a6b42e60aa..6d57b042ed2 100644 |
22 |
--- a/dev-python/setuptools_scm/Manifest |
23 |
+++ b/dev-python/setuptools_scm/Manifest |
24 |
@@ -1,8 +1,4 @@ |
25 |
DIST setuptools_scm-1.15.6.tar.gz 25779 BLAKE2B 01d6771c24015f072a46ff1429b964130f370f42a5cd3c634cc1bf9a506ca8547783087a0b9589ed4038168d034dddbe435540cd25a846536dc5a5c116f4168f SHA512 ae91ac28d396215be5418df3b36af726b6f2fb89707424383e920072fe8f9f75f613a99fe406cfbfffc61f9a857a3294259191694899351ef78aebba73d08816 |
26 |
DIST setuptools_scm-1.15.7.tar.gz 15426 BLAKE2B 6c23f2bd74f51ec8633a814ce22e63e5afb9953244659833a61e810c9029227e1cc25a067a59cec5666add76863070ae5b7dc2600953a45def886e52378a3399 SHA512 0aa6056c03fe100cdaa7b11c9d2073431bb5c3904a80a994a8263c0ccac81f7a2c0b6c7e6dfd09ad605c5ff0e86981b894b42920cb69d1ef1d43ea08b2ddd4a0 |
27 |
-DIST setuptools_scm-1.16.1.tar.gz 28956 BLAKE2B 6721830e9ef171768afb94e6d6aacb829665658599409880e87c58e1bf2c6366d04a666ff60ed5d689bf376c258eda93367a4c52fe28ec694a3a93ac109db1fb SHA512 fd5017648c4a8af696e8528eab37061776e8495e2de3640f726e5e4347836eca5a13cbe54fc0c2223c3ae80ede1a81a6f3d9c0910a417545b9f9f206e5177a13 |
28 |
-DIST setuptools_scm-2.1.0.tar.gz 32776 BLAKE2B 7a141f3fa826a82931b6c33afd19d3185f98b735451c03651b875051e514eab287b20ee382a9576841b6f1283b9d1bf3dcbd0aabc41d2f1143cf960b856c8492 SHA512 69ce171aa4d3b576883efffb350c59f38bfe8b35bd8e4e8fa1128d9f8a3e6cfaab832633e91fada36126f8e7e2c18663fad621d62c9834be1b5d36c58ae1d1c8 |
29 |
-DIST setuptools_scm-3.1.0.tar.gz 35585 BLAKE2B 7ecbdf325467cb3e5217150c548b99603e1bb851a3bc8c694acf3aeb0da798ec853d13b29ad0537bdf5c1010834576786e0dde3965d61991554a12cf206ba7e0 SHA512 bd84bb02900ddc7de2f02dd7cb62bafdea7040ebdc2506b72d05f2c6a6d16be903321e576f63a04f2aa13d8c75b1834dec7d9ea8444e8330281f8e586a3d6426 |
30 |
DIST setuptools_scm-3.2.0.tar.gz 39646 BLAKE2B 922e2e09a9826e8573900e8d279daf937289f91f8fead5230ea7082d85275d5d988d655854a36afd48d6b621eaa261ac9a0cd486acc115f0e389fb6828645e8b SHA512 1995754654f8bf509ec7f2186857ba0005dbaea0b1c734f521becb9d022c127e7b36f21da8defd5ec9883de5d0d4afe006f9d152c4cefe6beadf8b878e949eb2 |
31 |
-DIST setuptools_scm-3.3.0.tar.gz 40061 BLAKE2B 374b5d61ba9e4e9a7d5a7f9505ecafe7761d05bd8593a609a1a969af8323ec8fb29793c91276e8540552ef4e31dcca1f993d37374bd01f2c9f97e674447944d1 SHA512 e25be0e7efe56b5dcdaacf31ed512b3396285664a52a14a3d25d9ff4e2d6f3bb8e632d87b78d4ae323e0bbbfd16ac172a7d1b03a6837bf44a9753df1a4b92d0f |
32 |
DIST setuptools_scm-3.3.1.tar.gz 40183 BLAKE2B 417cb000c3edba7da8e92b8fb5b1d906d2ef0170eecc4c0b9d2ea490ef6bad4cbf5ca172bee0fc536c83605d361604c728bf4097f520ef8e62ee2d4f004e3db1 SHA512 cd8f3d1e97743097791001197c18a2c8336b9e499a543ec5d1ab6e9b613ef1417b59e34c329507a73c2626506ee892ccaee74dddc5c0950ff71c0bdfba954dc3 |
33 |
|
34 |
diff --git a/dev-python/setuptools_scm/files/setuptools_scm-3.1.0-test-failures.patch b/dev-python/setuptools_scm/files/setuptools_scm-3.1.0-test-failures.patch |
35 |
deleted file mode 100644 |
36 |
index 420bd6828b4..00000000000 |
37 |
--- a/dev-python/setuptools_scm/files/setuptools_scm-3.1.0-test-failures.patch |
38 |
+++ /dev/null |
39 |
@@ -1,105 +0,0 @@ |
40 |
-diff --git a/src/setuptools_scm/hg.py b/src/setuptools_scm/hg.py |
41 |
-index 972f493..8fedd68 100644 |
42 |
---- a/src/setuptools_scm/hg.py |
43 |
-+++ b/src/setuptools_scm/hg.py |
44 |
-@@ -13,7 +13,7 @@ def _hg_tagdist_normalize_tagcommit(config, tag, dist, node, branch): |
45 |
- "(branch(.)" # look for revisions in this branch only |
46 |
- " and tag({tag!r})::." # after the last tag |
47 |
- # ignore commits that only modify .hgtags and nothing else: |
48 |
-- " and (merge() or file('re:^(?!\.hgtags).*$'))" |
49 |
-+ " and (merge() or file('re:^(?!\\.hgtags).*$'))" |
50 |
- " and not tag({tag!r}))" # ignore the tagged commit itself |
51 |
- ).format( |
52 |
- tag=tag |
53 |
-@@ -70,7 +70,9 @@ def parse(root, config=None): |
54 |
- |
55 |
- def get_latest_normalizable_tag(root): |
56 |
- # Gets all tags containing a '.' (see #229) from oldest to newest |
57 |
-- cmd = ["hg", "log", "-r", "ancestors(.) and tag('re:\.')", "--template", "{tags}\n"] |
58 |
-+ cmd = [ |
59 |
-+ "hg", "log", "-r", "ancestors(.) and tag('re:\\.')", "--template", "{tags}\n" |
60 |
-+ ] |
61 |
- outlines = do(cmd, root).split() |
62 |
- if not outlines: |
63 |
- return "null" |
64 |
-diff --git a/testing/test_functions.py b/testing/test_functions.py |
65 |
-index 14d8961..c3d78b6 100644 |
66 |
---- a/testing/test_functions.py |
67 |
-+++ b/testing/test_functions.py |
68 |
-@@ -8,6 +8,8 @@ from setuptools_scm.version import ( |
69 |
- format_version, |
70 |
- tag_to_version, |
71 |
- ) |
72 |
-+ |
73 |
-+from setuptools_scm.config import Configuration |
74 |
- from setuptools_scm.utils import has_command |
75 |
- |
76 |
- PY3 = sys.version_info > (2,) |
77 |
-@@ -33,12 +35,14 @@ def test_next_tag(tag, expected): |
78 |
- assert guess_next_version(version) == expected |
79 |
- |
80 |
- |
81 |
-+c = Configuration() |
82 |
-+ |
83 |
- VERSIONS = { |
84 |
-- "exact": meta("1.1", distance=None, dirty=False), |
85 |
-- "zerodistance": meta("1.1", distance=0, dirty=False), |
86 |
-- "dirty": meta("1.1", distance=None, dirty=True), |
87 |
-- "distance": meta("1.1", distance=3, dirty=False), |
88 |
-- "distancedirty": meta("1.1", distance=3, dirty=True), |
89 |
-+ "exact": meta("1.1", distance=None, dirty=False, config=c), |
90 |
-+ "zerodistance": meta("1.1", distance=0, dirty=False, config=c), |
91 |
-+ "dirty": meta("1.1", distance=None, dirty=True, config=c), |
92 |
-+ "distance": meta("1.1", distance=3, dirty=False, config=c), |
93 |
-+ "distancedirty": meta("1.1", distance=3, dirty=True, config=c), |
94 |
- } |
95 |
- |
96 |
- |
97 |
-diff --git a/testing/test_version.py b/testing/test_version.py |
98 |
-index be940ef..a287a0d 100644 |
99 |
---- a/testing/test_version.py |
100 |
-+++ b/testing/test_version.py |
101 |
-@@ -3,33 +3,36 @@ from setuptools_scm.config import Configuration |
102 |
- from setuptools_scm.version import meta, simplified_semver_version, tags_to_versions |
103 |
- |
104 |
- |
105 |
-+c = Configuration() |
106 |
-+ |
107 |
-+ |
108 |
- @pytest.mark.parametrize( |
109 |
- "version, expected_next", |
110 |
- [ |
111 |
-- pytest.param(meta("1.0.0"), "1.0.0", id="exact"), |
112 |
-- pytest.param(meta("1.0"), "1.0.0", id="short_tag"), |
113 |
-+ pytest.param(meta("1.0.0", config=c), "1.0.0", id="exact"), |
114 |
-+ pytest.param(meta("1.0", config=c), "1.0.0", id="short_tag"), |
115 |
- pytest.param( |
116 |
-- meta("1.0.0", distance=2, branch="default"), |
117 |
-+ meta("1.0.0", distance=2, branch="default", config=c), |
118 |
- "1.0.1.dev2", |
119 |
- id="normal_branch", |
120 |
- ), |
121 |
- pytest.param( |
122 |
-- meta("1.0", distance=2, branch="default"), |
123 |
-+ meta("1.0", distance=2, branch="default", config=c), |
124 |
- "1.0.1.dev2", |
125 |
- id="normal_branch_short_tag", |
126 |
- ), |
127 |
- pytest.param( |
128 |
-- meta("1.0.0", distance=2, branch="feature"), |
129 |
-+ meta("1.0.0", distance=2, branch="feature", config=c), |
130 |
- "1.1.0.dev2", |
131 |
- id="feature_branch", |
132 |
- ), |
133 |
- pytest.param( |
134 |
-- meta("1.0", distance=2, branch="feature"), |
135 |
-+ meta("1.0", distance=2, branch="feature", config=c), |
136 |
- "1.1.0.dev2", |
137 |
- id="feature_branch_short_tag", |
138 |
- ), |
139 |
- pytest.param( |
140 |
-- meta("1.0.0", distance=2, branch="features/test"), |
141 |
-+ meta("1.0.0", distance=2, branch="features/test", config=c), |
142 |
- "1.1.0.dev2", |
143 |
- id="feature_in_branch", |
144 |
- ), |
145 |
|
146 |
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.16.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.16.1.ebuild |
147 |
deleted file mode 100644 |
148 |
index dd01bd8e118..00000000000 |
149 |
--- a/dev-python/setuptools_scm/setuptools_scm-1.16.1.ebuild |
150 |
+++ /dev/null |
151 |
@@ -1,37 +0,0 @@ |
152 |
-# Copyright 1999-2019 Gentoo Authors |
153 |
-# Distributed under the terms of the GNU General Public License v2 |
154 |
- |
155 |
-EAPI=6 |
156 |
- |
157 |
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 ) |
158 |
- |
159 |
-inherit distutils-r1 |
160 |
- |
161 |
-DESCRIPTION="package to manage versions by scm tags via setuptools" |
162 |
-HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm/" |
163 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
164 |
- |
165 |
-LICENSE="MIT" |
166 |
-SLOT="0" |
167 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" |
168 |
-IUSE="git mercurial test" |
169 |
- |
170 |
-DEPEND=" |
171 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
172 |
- git? ( dev-vcs/git ) |
173 |
- mercurial? ( dev-vcs/mercurial ) |
174 |
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )" |
175 |
- |
176 |
-python_test() { |
177 |
- distutils_install_for_testing |
178 |
- py.test -v -v -x -k testing/test_basic_api.py || die "tests failed under ${EPYTHON}" |
179 |
- py.test -v -v -x -k testing/test_functions.py || die "tests failed under ${EPYTHON}" |
180 |
- py.test -v -v -x -k testing/test_main.py || die "tests failed under ${EPYTHON}" |
181 |
- py.test -v -v -x -k testing/test_regressions.py || die "tests failed under ${EPYTHON}" |
182 |
- if use git; then |
183 |
- py.test -v -v -x -k testing/test_git.py || die "tests failed under ${EPYTHON}" |
184 |
- fi |
185 |
- if use mercurial; then |
186 |
- py.test -v -v -x -k testing/test_mercurial.py || die "tests failed under ${EPYTHON}" |
187 |
- fi |
188 |
-} |
189 |
|
190 |
diff --git a/dev-python/setuptools_scm/setuptools_scm-2.1.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-2.1.0.ebuild |
191 |
deleted file mode 100644 |
192 |
index 290e271e050..00000000000 |
193 |
--- a/dev-python/setuptools_scm/setuptools_scm-2.1.0.ebuild |
194 |
+++ /dev/null |
195 |
@@ -1,38 +0,0 @@ |
196 |
-# Copyright 1999-2019 Gentoo Authors |
197 |
-# Distributed under the terms of the GNU General Public License v2 |
198 |
- |
199 |
-EAPI=6 |
200 |
- |
201 |
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 ) |
202 |
- |
203 |
-inherit distutils-r1 |
204 |
- |
205 |
-DESCRIPTION="package to manage versions by scm tags via setuptools" |
206 |
-HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm/" |
207 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
208 |
- |
209 |
-LICENSE="MIT" |
210 |
-SLOT="0" |
211 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" |
212 |
-IUSE="test" |
213 |
- |
214 |
-DEPEND=" |
215 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
216 |
- test? ( |
217 |
- dev-python/pytest[${PYTHON_USEDEP}] |
218 |
- dev-vcs/git |
219 |
- dev-vcs/mercurial )" |
220 |
- |
221 |
-python_prepare_all() { |
222 |
- # network access |
223 |
- sed -i -e 's:test_pip_download:_&:' testing/test_regressions.py || die |
224 |
- # all fetch specific setuptools versions |
225 |
- rm testing/test_setuptools_support.py || die |
226 |
- |
227 |
- distutils-r1_python_prepare_all |
228 |
-} |
229 |
- |
230 |
-python_test() { |
231 |
- distutils_install_for_testing |
232 |
- py.test -v -v -x || die "Tests fail with ${EPYTHON}" |
233 |
-} |
234 |
|
235 |
diff --git a/dev-python/setuptools_scm/setuptools_scm-3.1.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-3.1.0.ebuild |
236 |
deleted file mode 100644 |
237 |
index 46e4533a38d..00000000000 |
238 |
--- a/dev-python/setuptools_scm/setuptools_scm-3.1.0.ebuild |
239 |
+++ /dev/null |
240 |
@@ -1,43 +0,0 @@ |
241 |
-# Copyright 1999-2019 Gentoo Authors |
242 |
-# Distributed under the terms of the GNU General Public License v2 |
243 |
- |
244 |
-EAPI=6 |
245 |
- |
246 |
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 ) |
247 |
- |
248 |
-inherit distutils-r1 |
249 |
- |
250 |
-DESCRIPTION="package to manage versions by scm tags via setuptools" |
251 |
-HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm/" |
252 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
253 |
- |
254 |
-LICENSE="MIT" |
255 |
-SLOT="0" |
256 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" |
257 |
-IUSE="test" |
258 |
-RESTRICT="!test? ( test )" |
259 |
- |
260 |
-DEPEND=" |
261 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
262 |
- test? ( |
263 |
- dev-python/pytest[${PYTHON_USEDEP}] |
264 |
- dev-vcs/git |
265 |
- dev-vcs/mercurial )" |
266 |
- |
267 |
-python_prepare_all() { |
268 |
- local PATCHES=( |
269 |
- "${FILESDIR}"/setuptools_scm-3.1.0-test-failures.patch |
270 |
- ) |
271 |
- |
272 |
- # network access |
273 |
- sed -i -e 's:test_pip_download:_&:' testing/test_regressions.py || die |
274 |
- # all fetch specific setuptools versions |
275 |
- rm testing/test_setuptools_support.py || die |
276 |
- |
277 |
- distutils-r1_python_prepare_all |
278 |
-} |
279 |
- |
280 |
-python_test() { |
281 |
- distutils_install_for_testing |
282 |
- py.test -v -v -x || die "Tests fail with ${EPYTHON}" |
283 |
-} |
284 |
|
285 |
diff --git a/dev-python/setuptools_scm/setuptools_scm-3.3.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-3.3.0.ebuild |
286 |
deleted file mode 100644 |
287 |
index 7ea05108202..00000000000 |
288 |
--- a/dev-python/setuptools_scm/setuptools_scm-3.3.0.ebuild |
289 |
+++ /dev/null |
290 |
@@ -1,39 +0,0 @@ |
291 |
-# Copyright 1999-2019 Gentoo Authors |
292 |
-# Distributed under the terms of the GNU General Public License v2 |
293 |
- |
294 |
-EAPI=6 |
295 |
- |
296 |
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 ) |
297 |
- |
298 |
-inherit distutils-r1 |
299 |
- |
300 |
-DESCRIPTION="package to manage versions by scm tags via setuptools" |
301 |
-HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm/" |
302 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
303 |
- |
304 |
-LICENSE="MIT" |
305 |
-SLOT="0" |
306 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" |
307 |
-IUSE="test" |
308 |
-RESTRICT="!test? ( test )" |
309 |
- |
310 |
-DEPEND=" |
311 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
312 |
- test? ( |
313 |
- dev-python/pytest[${PYTHON_USEDEP}] |
314 |
- dev-vcs/git |
315 |
- dev-vcs/mercurial )" |
316 |
- |
317 |
-python_prepare_all() { |
318 |
- # network access |
319 |
- sed -i -e 's:test_pip_download:_&:' testing/test_regressions.py || die |
320 |
- # all fetch specific setuptools versions |
321 |
- rm testing/test_setuptools_support.py || die |
322 |
- |
323 |
- distutils-r1_python_prepare_all |
324 |
-} |
325 |
- |
326 |
-python_test() { |
327 |
- distutils_install_for_testing |
328 |
- py.test -v -v -x || die "Tests fail with ${EPYTHON}" |
329 |
-} |