1 |
commit: 5ecb9047a915535adb7102488fbaf6225a91952f |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 1 00:40:25 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 1 00:40:25 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ecb9047 |
7 |
|
8 |
app-admin/salt: Remove old (py3.6) |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
app-admin/salt/Manifest | 2 - |
13 |
.../files/salt-2019.2.0-remove-raet-tests.patch | 43 ------ |
14 |
app-admin/salt/files/salt-2019.2.0-tests.patch | 73 ---------- |
15 |
.../salt/files/salt-2019.2.2-newer-deps.patch | 136 ------------------- |
16 |
...lt-2019.2.2-workaround-broken-mock-on-py2.patch | 28 ---- |
17 |
app-admin/salt/salt-2019.2.7.ebuild | 150 -------------------- |
18 |
app-admin/salt/salt-2019.2.8.ebuild | 151 --------------------- |
19 |
7 files changed, 583 deletions(-) |
20 |
|
21 |
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest |
22 |
index 8b84c3d584e..fff5f12537f 100644 |
23 |
--- a/app-admin/salt/Manifest |
24 |
+++ b/app-admin/salt/Manifest |
25 |
@@ -1,5 +1,3 @@ |
26 |
-DIST salt-2019.2.7.tar.gz 14576515 BLAKE2B 4b2476c874a806de8664abd7852d5f856fc1946cc021d3ec8d206f69ec3cd809fe156d4d916d00304c36aad1dfab3a60309eb87d21ce7bb9afc7e8ea77ac23aa SHA512 e9a0d1ada0172239a31c6a8a628e71367aba072c06fe5420f4b864b9c67da89edd03f95abd46fd9ae414c2262b4e7e5c7f53c606f9f3f58e4c84129f2ed43c9e |
27 |
-DIST salt-2019.2.8.tar.gz 14595964 BLAKE2B 7551bbfffe6e4f3107806ef95c9ad1b3fdff6274e8fa679bee143be203929df6d51dcc1e704d1e9458e8051197277257c68c7fd18cf54cad1c49314574c8471b SHA512 e4b45ee264a4e663c6039ca6c89ea0aeff1273b2b40b4d799a30cdb6b23cf568be81e4807ecb2832b2a596993f1512ef45d68e444f3b32e6f5a38d8ce548ddac |
28 |
DIST salt-3000.2-py38-misc.patch.gz 6250 BLAKE2B 68fff80a042e6bf208ea2d9692da7a7b1e29572f1ec3c850c14743bbf2821d231f933ec4e6d6eaad12acee0b7666888a37a72872b2b082c92d8db9de988fbbec SHA512 6d4a66323a423e630f7cc73b566ed96c452c8fc3d72c25a2dd86033c4774c1c8e8b8701e1d4ee92994d4148c398d704f419023e26d8b40c8fdd63f9d79d9d52f |
29 |
DIST salt-3000.5.tar.gz 15229450 BLAKE2B 135e9b9dcc461ac898231ce46e6a1359e6d60a43822320950bc0b83057f768dadf55320dd73df72d5bc917f324eef4661e6f75d8eb8e84aef958bd2df8924cfc SHA512 2579f65c24d22d77132057bd8cf37040d7d149624745dd68b4c44318be786580dcc34bf563f90d7de9ef5b726b2453bef4d8639bc8fbd9c5e691500520335317 |
30 |
DIST salt-3000.6.tar.gz 15236781 BLAKE2B 5a532a6915b331fb532dc6e1651cf8fca3e1a5e9f29f6d75260fdb1162dbfeec755c65f7c6fc28b1cc7dc3ace978547830af31aafc1eee8419bbc7e695725787 SHA512 739e3671766c45a0ef1eb45933c7f00f14586e91f4c4a79cbed913a48961a48baee853206ba569491756e8a872d22f3635eb6bc1a366020e551c567b2334c508 |
31 |
|
32 |
diff --git a/app-admin/salt/files/salt-2019.2.0-remove-raet-tests.patch b/app-admin/salt/files/salt-2019.2.0-remove-raet-tests.patch |
33 |
deleted file mode 100644 |
34 |
index fab9f38df77..00000000000 |
35 |
--- a/app-admin/salt/files/salt-2019.2.0-remove-raet-tests.patch |
36 |
+++ /dev/null |
37 |
@@ -1,43 +0,0 @@ |
38 |
-diff --git a/tests/unit/modules/test_event.py b/tests/unit/modules/test_event.py |
39 |
-index e5d2c946ae..e9140670cb 100644 |
40 |
---- a/tests/unit/modules/test_event.py |
41 |
-+++ b/tests/unit/modules/test_event.py |
42 |
-@@ -47,12 +47,6 @@ class EventTestCase(TestCase, LoaderModuleMockMixin): |
43 |
- preload = {'id': 'id', 'tag': 'tag', 'data': 'data', |
44 |
- 'tok': 'salt', 'cmd': '_minion_event'} |
45 |
- |
46 |
-- with patch.dict(event.__opts__, {'transport': 'raet', |
47 |
-- 'local': False}): |
48 |
-- with patch.object(salt_transport_channel_factory, 'send', |
49 |
-- return_value=None): |
50 |
-- self.assertTrue(event.fire_master('data', 'tag')) |
51 |
-- |
52 |
- with patch.dict(event.__opts__, {'transport': 'A', |
53 |
- 'master_uri': 'localhost', |
54 |
- 'local': False}): |
55 |
-diff --git a/tests/unit/utils/test_verify.py b/tests/unit/utils/test_verify.py |
56 |
-index 63b9ae3181..2c8294ef77 100644 |
57 |
---- a/tests/unit/utils/test_verify.py |
58 |
-+++ b/tests/unit/utils/test_verify.py |
59 |
-@@ -326,7 +326,7 @@ class TestVerifyLog(TestCase): |
60 |
- verify_log_files([path], getpass.getuser()) |
61 |
- self.assertTrue(os.path.exists(path)) |
62 |
- |
63 |
-- |
64 |
-+@skipIf(True, "broken under sandbox") |
65 |
- class TestCleanPath(TestCase): |
66 |
- ''' |
67 |
- salt.utils.clean_path works as expected |
68 |
-@@ -396,10 +396,10 @@ class TestCleanPathLink(TestCase): |
69 |
- test_path = os.path.join(self.from_path, 'test') |
70 |
- expect_path = os.path.join(self.to_path, 'test') |
71 |
- ret = clean_path(self.from_path, test_path) |
72 |
-- assert ret == expect_path, "{} is not {}".format(ret, expect_path) |
73 |
-+ assert ret == os.path.realpath(expect_path), "{} is not {}".format(ret, expect_path) |
74 |
- |
75 |
- def test_clean_path_symlinked_tgt(self): |
76 |
- test_path = os.path.join(self.to_path, 'test') |
77 |
- expect_path = os.path.join(self.to_path, 'test') |
78 |
- ret = clean_path(self.from_path, test_path) |
79 |
-- assert ret == expect_path, "{} is not {}".format(ret, expect_path) |
80 |
-+ assert ret == os.path.realpath(expect_path), "{} is not {}".format(ret, expect_path) |
81 |
|
82 |
diff --git a/app-admin/salt/files/salt-2019.2.0-tests.patch b/app-admin/salt/files/salt-2019.2.0-tests.patch |
83 |
deleted file mode 100644 |
84 |
index 830fcbffe36..00000000000 |
85 |
--- a/app-admin/salt/files/salt-2019.2.0-tests.patch |
86 |
+++ /dev/null |
87 |
@@ -1,73 +0,0 @@ |
88 |
-diff --git a/tests/unit/fileserver/test_gitfs.py b/tests/unit/fileserver/test_gitfs.py |
89 |
-index 4e93df4e62..38c13efb6b 100644 |
90 |
---- a/tests/unit/fileserver/test_gitfs.py |
91 |
-+++ b/tests/unit/fileserver/test_gitfs.py |
92 |
-@@ -151,6 +151,7 @@ class GitfsConfigTestCase(TestCase, LoaderModuleMockMixin): |
93 |
- if exc.errno != errno.EEXIST: |
94 |
- raise |
95 |
- |
96 |
-+ @skipIf(True, 'currently failing on Gentoo') |
97 |
- def test_per_saltenv_config(self): |
98 |
- opts_override = textwrap.dedent(''' |
99 |
- gitfs_root: salt |
100 |
-diff --git a/tests/unit/grains/test_core.py b/tests/unit/grains/test_core.py |
101 |
-index 445df0c98a..17ca123172 100644 |
102 |
---- a/tests/unit/grains/test_core.py |
103 |
-+++ b/tests/unit/grains/test_core.py |
104 |
-@@ -710,6 +710,7 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin): |
105 |
- ) |
106 |
- |
107 |
- @skipIf(not salt.utils.platform.is_linux(), 'System is not Linux') |
108 |
-+ @skipIf(True, 'Test assumes running under Xen') |
109 |
- def test_xen_virtual(self): |
110 |
- ''' |
111 |
- Test if OS grains are parsed correctly in Ubuntu Xenial Xerus |
112 |
-diff --git a/tests/unit/utils/test_asynchronous.py b/tests/unit/utils/test_asynchronous.py |
113 |
-index 694a7aebfe..704f2d894f 100644 |
114 |
---- a/tests/unit/utils/test_asynchronous.py |
115 |
-+++ b/tests/unit/utils/test_asynchronous.py |
116 |
-@@ -3,6 +3,8 @@ |
117 |
- # Import Python Libs |
118 |
- from __future__ import absolute_import, print_function, unicode_literals |
119 |
- |
120 |
-+from unittest import skipIf |
121 |
-+ |
122 |
- # Import 3rd-party libs |
123 |
- import tornado.testing |
124 |
- import tornado.gen |
125 |
-@@ -35,6 +37,7 @@ class HelperB(object): |
126 |
- |
127 |
- |
128 |
- class TestSyncWrapper(AsyncTestCase): |
129 |
-+ @skipIf(True, "fails in sandbox") |
130 |
- @tornado.testing.gen_test |
131 |
- def test_helpers(self): |
132 |
- ''' |
133 |
-@@ -56,6 +59,7 @@ class TestSyncWrapper(AsyncTestCase): |
134 |
- ret = sync.sleep() |
135 |
- self.assertTrue(ret) |
136 |
- |
137 |
-+ @skipIf(True, "fails in sandbox") |
138 |
- def test_double(self): |
139 |
- ''' |
140 |
- Test when the asynchronous wrapper object itself creates a wrap of another thing |
141 |
-@@ -67,6 +71,7 @@ class TestSyncWrapper(AsyncTestCase): |
142 |
- ret = sync.sleep() |
143 |
- self.assertFalse(ret) |
144 |
- |
145 |
-+ @skipIf(True, "fails in sandbox") |
146 |
- def test_double_sameloop(self): |
147 |
- ''' |
148 |
- Test asynchronous wrappers initiated from the same IOLoop, to ensure that |
149 |
-diff --git a/tests/unit/utils/test_jinja.py b/tests/unit/utils/test_jinja.py |
150 |
-index da666ef4c7..e3523049b7 100644 |
151 |
---- a/tests/unit/utils/test_jinja.py |
152 |
-+++ b/tests/unit/utils/test_jinja.py |
153 |
-@@ -1102,6 +1102,7 @@ class TestCustomExtensions(TestCase): |
154 |
- dict(opts=self.local_opts, saltenv='test', salt=self.local_salt)) |
155 |
- self.assertEqual(rendered, '16777216') |
156 |
- |
157 |
-+ @skipIf(True, 'Skipping tests that require internet access') |
158 |
- @flaky |
159 |
- def test_http_query(self): |
160 |
- ''' |
161 |
|
162 |
diff --git a/app-admin/salt/files/salt-2019.2.2-newer-deps.patch b/app-admin/salt/files/salt-2019.2.2-newer-deps.patch |
163 |
deleted file mode 100644 |
164 |
index ee3bc060417..00000000000 |
165 |
--- a/app-admin/salt/files/salt-2019.2.2-newer-deps.patch |
166 |
+++ /dev/null |
167 |
@@ -1,136 +0,0 @@ |
168 |
-diff --git a/salt/modules/dockercompose.py b/salt/modules/dockercompose.py |
169 |
-index 61e937536c..0f37e0d43a 100644 |
170 |
---- a/salt/modules/dockercompose.py |
171 |
-+++ b/salt/modules/dockercompose.py |
172 |
-@@ -241,7 +241,7 @@ def __load_docker_compose(path): |
173 |
- None, None) |
174 |
- try: |
175 |
- with salt.utils.files.fopen(file_path, 'r') as fl: |
176 |
-- loaded = yaml.load(fl) |
177 |
-+ loaded = yaml.safe_load(fl) |
178 |
- except EnvironmentError: |
179 |
- return None, __standardize_result(False, |
180 |
- 'Could not read {0}'.format(file_path), |
181 |
-@@ -371,7 +371,7 @@ def __load_compose_definitions(path, definition): |
182 |
- None, None) |
183 |
- else: |
184 |
- try: |
185 |
-- loaded_definition = yaml.load(definition) |
186 |
-+ loaded_definition = yaml.safe_load(definition) |
187 |
- except yaml.YAMLError as yerr: |
188 |
- msg = 'Could not parse {0} {1}'.format(definition, yerr) |
189 |
- return None, None, __standardize_result(False, msg, |
190 |
-diff --git a/tests/integration/utils/test_win_runas.py b/tests/integration/utils/test_win_runas.py |
191 |
-index 3042a77991..d4057a4d03 100644 |
192 |
---- a/tests/integration/utils/test_win_runas.py |
193 |
-+++ b/tests/integration/utils/test_win_runas.py |
194 |
-@@ -539,7 +539,7 @@ class RunAsTest(ModuleCase): |
195 |
- win32serviceutil.StartService('test service') |
196 |
- wait_for_service('test service') |
197 |
- with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp: |
198 |
-- ret = yaml.load(fp) |
199 |
-+ ret = yaml.safe_load(fp) |
200 |
- assert ret['retcode'] == 1, ret |
201 |
- |
202 |
- @with_system_user('test-runas', on_existing='delete', delete=True, |
203 |
-@@ -560,7 +560,7 @@ class RunAsTest(ModuleCase): |
204 |
- win32serviceutil.StartService('test service') |
205 |
- wait_for_service('test service') |
206 |
- with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp: |
207 |
-- ret = yaml.load(fp) |
208 |
-+ ret = yaml.safe_load(fp) |
209 |
- assert ret['retcode'] == 1, ret |
210 |
- |
211 |
- @with_system_user('test-runas-admin', on_existing='delete', delete=True, |
212 |
-@@ -581,7 +581,7 @@ class RunAsTest(ModuleCase): |
213 |
- win32serviceutil.StartService('test service') |
214 |
- wait_for_service('test service') |
215 |
- with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp: |
216 |
-- ret = yaml.load(fp) |
217 |
-+ ret = yaml.safe_load(fp) |
218 |
- assert ret['retcode'] == 0, ret |
219 |
- |
220 |
- @with_system_user('test-runas-admin', on_existing='delete', delete=True, |
221 |
-@@ -602,7 +602,7 @@ class RunAsTest(ModuleCase): |
222 |
- win32serviceutil.StartService('test service') |
223 |
- wait_for_service('test service') |
224 |
- with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp: |
225 |
-- ret = yaml.load(fp) |
226 |
-+ ret = yaml.safe_load(fp) |
227 |
- assert ret['retcode'] == 0, ret |
228 |
- |
229 |
- def test_runas_service_system_user(self): |
230 |
-@@ -621,5 +621,5 @@ class RunAsTest(ModuleCase): |
231 |
- win32serviceutil.StartService('test service') |
232 |
- wait_for_service('test service') |
233 |
- with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp: |
234 |
-- ret = yaml.load(fp) |
235 |
-+ ret = yaml.safe_load(fp) |
236 |
- assert ret['retcode'] == 0, ret |
237 |
-diff --git a/tests/unit/utils/test_schema.py b/tests/unit/utils/test_schema.py |
238 |
-index a07fcbab6b..79072bb89e 100644 |
239 |
---- a/tests/unit/utils/test_schema.py |
240 |
-+++ b/tests/unit/utils/test_schema.py |
241 |
-@@ -5,6 +5,7 @@ |
242 |
- |
243 |
- # Import python libs |
244 |
- from __future__ import absolute_import, print_function, unicode_literals |
245 |
-+import sys |
246 |
- import copy |
247 |
- |
248 |
- # Import Salt Testing Libs |
249 |
-@@ -506,10 +507,7 @@ class ConfigTestCase(TestCase): |
250 |
- {'personal_access_token': 'foo'}, |
251 |
- Requirements.serialize() |
252 |
- ) |
253 |
-- if JSONSCHEMA_VERSION >= _LooseVersion('3.0.0'): |
254 |
-- self.assertIn('\'ssh_key_file\' is a required property', excinfo.exception.message) |
255 |
-- else: |
256 |
-- self.assertIn('is not valid under any of the given schemas', excinfo.exception.message) |
257 |
-+ self.assertIn('\'ssh_key_file\' is a required property', excinfo.exception.message) |
258 |
- |
259 |
- def test_boolean_config(self): |
260 |
- item = schema.BooleanItem(title='Hungry', description='Are you hungry?') |
261 |
-@@ -1733,10 +1731,11 @@ class ConfigTestCase(TestCase): |
262 |
- |
263 |
- with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo: |
264 |
- jsonschema.validate({'item': {'sides': '4', 'color': 'blue'}}, TestConf.serialize()) |
265 |
-- if JSONSCHEMA_VERSION >= _LooseVersion('3.0.0'): |
266 |
-- self.assertIn('\'4\' is not of type \'boolean\'', excinfo.exception.message) |
267 |
-+ |
268 |
-+ if sys.hexversion >= 0x03000000: |
269 |
-+ self.assertIn("'4' is not of type 'boolean'", excinfo.exception.message) |
270 |
- else: |
271 |
-- self.assertIn('is not valid under any of the given schemas', excinfo.exception.message) |
272 |
-+ self.assertIn("u'4' is not of type u'boolean'", excinfo.exception.message) |
273 |
- |
274 |
- class TestConf(schema.Schema): |
275 |
- item = schema.DictItem( |
276 |
-@@ -1839,10 +1838,10 @@ class ConfigTestCase(TestCase): |
277 |
- |
278 |
- with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo: |
279 |
- jsonschema.validate({'item': ['maybe']}, TestConf.serialize()) |
280 |
-- if JSONSCHEMA_VERSION >= _LooseVersion('3.0.0'): |
281 |
-- self.assertIn('\'maybe\' is not one of [\'yes\']', excinfo.exception.message) |
282 |
-+ if sys.hexversion >= 0x03000000: |
283 |
-+ self.assertIn("'maybe' is not one of ['yes']", excinfo.exception.message) |
284 |
- else: |
285 |
-- self.assertIn('is not valid under any of the given schemas', excinfo.exception.message) |
286 |
-+ self.assertIn("u'maybe' is not one of [u'yes']", excinfo.exception.message) |
287 |
- |
288 |
- with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo: |
289 |
- jsonschema.validate({'item': 2}, TestConf.serialize()) |
290 |
-@@ -1894,10 +1893,10 @@ class ConfigTestCase(TestCase): |
291 |
- |
292 |
- with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo: |
293 |
- jsonschema.validate({'item': ['maybe']}, TestConf.serialize()) |
294 |
-- if JSONSCHEMA_VERSION >= _LooseVersion('3.0.0'): |
295 |
-- self.assertIn('\'maybe\' is not one of [\'yes\']', excinfo.exception.message) |
296 |
-+ if sys.hexversion >= 0x03000000: |
297 |
-+ self.assertIn("'maybe' is not one of ['yes']", excinfo.exception.message) |
298 |
- else: |
299 |
-- self.assertIn('is not valid under any of the given schemas', excinfo.exception.message) |
300 |
-+ self.assertIn("u'maybe' is not one of [u'yes']", excinfo.exception.message) |
301 |
- |
302 |
- with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo: |
303 |
- jsonschema.validate({'item': 2}, TestConf.serialize()) |
304 |
|
305 |
diff --git a/app-admin/salt/files/salt-2019.2.2-workaround-broken-mock-on-py2.patch b/app-admin/salt/files/salt-2019.2.2-workaround-broken-mock-on-py2.patch |
306 |
deleted file mode 100644 |
307 |
index 8d28fe7f16a..00000000000 |
308 |
--- a/app-admin/salt/files/salt-2019.2.2-workaround-broken-mock-on-py2.patch |
309 |
+++ /dev/null |
310 |
@@ -1,28 +0,0 @@ |
311 |
-diff --git a/tests/unit/utils/test_network.py b/tests/unit/utils/test_network.py |
312 |
-index af5cbbab2b..15236c127a 100644 |
313 |
---- a/tests/unit/utils/test_network.py |
314 |
-+++ b/tests/unit/utils/test_network.py |
315 |
-@@ -1,6 +1,7 @@ |
316 |
- # -*- coding: utf-8 -*- |
317 |
- # Import Python libs |
318 |
- from __future__ import absolute_import, unicode_literals, print_function |
319 |
-+import sys |
320 |
- import logging |
321 |
- import socket |
322 |
- import textwrap |
323 |
-@@ -249,6 +250,7 @@ class NetworkTestCase(TestCase): |
324 |
- log.error('bad host_port value: "%s" failed to trigger ValueError exception', host_port) |
325 |
- raise _e_ |
326 |
- |
327 |
-+ @skipIf(sys.hexversion < 0x03000000, "https://github.com/testing-cabal/mock/issues/323") |
328 |
- def test_dns_check(self): |
329 |
- hosts = [ |
330 |
- {'host': '10.10.0.3', |
331 |
-@@ -302,6 +304,7 @@ class NetworkTestCase(TestCase): |
332 |
- "Invalid or unresolveable address"): |
333 |
- network.dns_check('foo', '1') |
334 |
- |
335 |
-+ @skipIf(sys.hexversion < 0x03000000, "https://github.com/testing-cabal/mock/issues/323") |
336 |
- def test_test_addrs(self): |
337 |
- # subset of real data from getaddrinfo against saltstack.com |
338 |
- addrinfo = [(30, 2, 17, '', ('2600:9000:21eb:a800:8:1031:abc0:93a1', 0, 0, 0)), |
339 |
|
340 |
diff --git a/app-admin/salt/salt-2019.2.7.ebuild b/app-admin/salt/salt-2019.2.7.ebuild |
341 |
deleted file mode 100644 |
342 |
index e39bedf1898..00000000000 |
343 |
--- a/app-admin/salt/salt-2019.2.7.ebuild |
344 |
+++ /dev/null |
345 |
@@ -1,150 +0,0 @@ |
346 |
-# Copyright 1999-2020 Gentoo Authors |
347 |
-# Distributed under the terms of the GNU General Public License v2 |
348 |
- |
349 |
-EAPI=7 |
350 |
-PYTHON_COMPAT=( python3_6 ) |
351 |
-DISTUTILS_USE_SETUPTOOLS=bdepend |
352 |
-inherit systemd distutils-r1 |
353 |
- |
354 |
-DESCRIPTION="Salt is a remote execution and configuration manager" |
355 |
-HOMEPAGE="https://www.saltstack.com/resources/community/ |
356 |
- https://github.com/saltstack" |
357 |
- |
358 |
-if [[ ${PV} == 9999* ]]; then |
359 |
- inherit git-r3 |
360 |
- EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" |
361 |
- EGIT_BRANCH="develop" |
362 |
- SRC_URI="" |
363 |
-else |
364 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
365 |
- KEYWORDS="~amd64 ~x86" |
366 |
-fi |
367 |
- |
368 |
-LICENSE="Apache-2.0" |
369 |
-SLOT="0" |
370 |
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb neutron nova |
371 |
- openssl portage profile redis selinux test vim-syntax" |
372 |
- |
373 |
-RDEPEND=" |
374 |
- sys-apps/pciutils |
375 |
- dev-python/jinja[${PYTHON_USEDEP}] |
376 |
- dev-python/libnacl[${PYTHON_USEDEP}] |
377 |
- >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] |
378 |
- <dev-python/msgpack-1.0[${PYTHON_USEDEP}] |
379 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
380 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
381 |
- dev-python/pycryptodome[${PYTHON_USEDEP}] |
382 |
- >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] |
383 |
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
384 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
385 |
- >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] |
386 |
- <www-servers/tornado-5.0[${PYTHON_USEDEP}] |
387 |
- libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
388 |
- mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
389 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
390 |
- libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) |
391 |
- openssl? ( |
392 |
- dev-libs/openssl:0=[-bindist] |
393 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
394 |
- ) |
395 |
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
396 |
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
397 |
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
398 |
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
399 |
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
400 |
- selinux? ( sec-policy/selinux-salt ) |
401 |
- nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) |
402 |
- neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) |
403 |
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
404 |
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
405 |
- vim-syntax? ( app-vim/salt-vim )" |
406 |
-BDEPEND=" |
407 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
408 |
- test? ( |
409 |
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
410 |
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] |
411 |
- >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] |
412 |
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] |
413 |
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
414 |
- dev-python/pip[${PYTHON_USEDEP}] |
415 |
- dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] |
416 |
- >=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}] |
417 |
- <dev-python/pytest-salt-2020.0.0[${PYTHON_USEDEP}] |
418 |
- dev-python/psutil[${PYTHON_USEDEP}] |
419 |
- dev-python/pytest[${PYTHON_USEDEP}] |
420 |
- >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] |
421 |
- dev-python/virtualenv[${PYTHON_USEDEP}] |
422 |
- !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] ) |
423 |
- ${RDEPEND} |
424 |
- )" |
425 |
- |
426 |
-DOCS=( README.rst AUTHORS ) |
427 |
- |
428 |
-RESTRICT="!test? ( test ) x86? ( test )" |
429 |
- |
430 |
-PATCHES=( |
431 |
- "${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch" |
432 |
- "${FILESDIR}/salt-2019.2.0-tests.patch" |
433 |
- "${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch" |
434 |
- "${FILESDIR}/salt-2019.2.2-newer-deps.patch" |
435 |
- "${FILESDIR}/salt-2019.2.2-workaround-broken-mock-on-py2.patch" |
436 |
- "${FILESDIR}/salt-2019.2.0-remove-raet-tests.patch" |
437 |
-) |
438 |
- |
439 |
-python_prepare() { |
440 |
- # remove tests with external dependencies that may not be available |
441 |
- rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die |
442 |
- rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die |
443 |
- rm tests/unit/states/test_boto_vpc.py || die |
444 |
- |
445 |
- # breaks with permission errors |
446 |
- rm tests/unit/utils/test_cache.py || die |
447 |
- |
448 |
- # remove raet due to deps being dropped |
449 |
- rm tests/unit/modules/test_raet_publish.py \ |
450 |
- salt/transport/raet.py \ |
451 |
- salt/daemons/test/test_raetkey.py || die |
452 |
- |
453 |
- # allow the use of the renamed msgpack |
454 |
- sed -i '/^msgpack/d' requirements/base.txt || die |
455 |
-} |
456 |
- |
457 |
-python_install_all() { |
458 |
- local svc |
459 |
- USE_SETUPTOOLS=1 distutils-r1_python_install_all |
460 |
- |
461 |
- for svc in minion master syndic api; do |
462 |
- newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} |
463 |
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
464 |
- systemd_dounit "${FILESDIR}"/salt-${svc}.service |
465 |
- done |
466 |
- |
467 |
- insinto /etc/${PN} |
468 |
- doins -r conf/* |
469 |
-} |
470 |
- |
471 |
-python_test() { |
472 |
- local tempdir |
473 |
- # testsuite likes lots of files |
474 |
- ulimit -n 3072 || die |
475 |
- |
476 |
- # ${T} is too long a path for the tests to work |
477 |
- tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" |
478 |
- mkdir "${T}/$(basename "${tempdir}")" |
479 |
- mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die |
480 |
- |
481 |
- ( |
482 |
- cleanup() { rm -f "${tempdir}" || die; } |
483 |
- |
484 |
- trap cleanup EXIT |
485 |
- |
486 |
- addwrite "${tempdir}" |
487 |
- ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die |
488 |
- |
489 |
- USE_SETUPTOOLS=1 SHELL="/bin/bash" \ |
490 |
- TMPDIR="${tempdir}" \ |
491 |
- ${EPYTHON} tests/runtests.py \ |
492 |
- --unit-tests --no-report --verbose \ |
493 |
- || die "testing failed with ${EPYTHON}" |
494 |
- ) |
495 |
-} |
496 |
|
497 |
diff --git a/app-admin/salt/salt-2019.2.8.ebuild b/app-admin/salt/salt-2019.2.8.ebuild |
498 |
deleted file mode 100644 |
499 |
index 2a0b207dfee..00000000000 |
500 |
--- a/app-admin/salt/salt-2019.2.8.ebuild |
501 |
+++ /dev/null |
502 |
@@ -1,151 +0,0 @@ |
503 |
-# Copyright 1999-2020 Gentoo Authors |
504 |
-# Distributed under the terms of the GNU General Public License v2 |
505 |
- |
506 |
-EAPI=7 |
507 |
-PYTHON_COMPAT=( python3_6 ) |
508 |
-DISTUTILS_USE_SETUPTOOLS=no |
509 |
-inherit systemd distutils-r1 |
510 |
- |
511 |
-DESCRIPTION="Salt is a remote execution and configuration manager" |
512 |
-HOMEPAGE="https://www.saltstack.com/resources/community/ |
513 |
- https://github.com/saltstack" |
514 |
- |
515 |
-if [[ ${PV} == 9999* ]]; then |
516 |
- inherit git-r3 |
517 |
- EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" |
518 |
- EGIT_BRANCH="develop" |
519 |
- SRC_URI="" |
520 |
-else |
521 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
522 |
- KEYWORDS="~amd64 ~x86" |
523 |
-fi |
524 |
- |
525 |
-LICENSE="Apache-2.0" |
526 |
-SLOT="0" |
527 |
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb neutron nova |
528 |
- openssl portage profile redis selinux test vim-syntax" |
529 |
- |
530 |
-RDEPEND=" |
531 |
- sys-apps/pciutils |
532 |
- dev-python/jinja[${PYTHON_USEDEP}] |
533 |
- dev-python/libnacl[${PYTHON_USEDEP}] |
534 |
- >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] |
535 |
- <dev-python/msgpack-1.0[${PYTHON_USEDEP}] |
536 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
537 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
538 |
- dev-python/pycryptodome[${PYTHON_USEDEP}] |
539 |
- >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] |
540 |
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
541 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
542 |
- >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] |
543 |
- <www-servers/tornado-5.0[${PYTHON_USEDEP}] |
544 |
- libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
545 |
- mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
546 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
547 |
- libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) |
548 |
- openssl? ( |
549 |
- dev-libs/openssl:0=[-bindist] |
550 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
551 |
- ) |
552 |
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
553 |
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
554 |
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
555 |
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
556 |
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
557 |
- selinux? ( sec-policy/selinux-salt ) |
558 |
- nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) |
559 |
- neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) |
560 |
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
561 |
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
562 |
- vim-syntax? ( app-vim/salt-vim )" |
563 |
-BDEPEND=" |
564 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
565 |
- test? ( |
566 |
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
567 |
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] |
568 |
- >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] |
569 |
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] |
570 |
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
571 |
- dev-python/pip[${PYTHON_USEDEP}] |
572 |
- dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] |
573 |
- >=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}] |
574 |
- <dev-python/pytest-salt-2020.0.0[${PYTHON_USEDEP}] |
575 |
- dev-python/psutil[${PYTHON_USEDEP}] |
576 |
- dev-python/pytest[${PYTHON_USEDEP}] |
577 |
- >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] |
578 |
- dev-python/virtualenv[${PYTHON_USEDEP}] |
579 |
- !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] ) |
580 |
- ${RDEPEND} |
581 |
- )" |
582 |
- |
583 |
-DOCS=( README.rst AUTHORS ) |
584 |
- |
585 |
-RESTRICT="!test? ( test ) x86? ( test )" |
586 |
- |
587 |
-PATCHES=( |
588 |
- "${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch" |
589 |
- "${FILESDIR}/salt-2019.2.0-tests.patch" |
590 |
- "${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch" |
591 |
- "${FILESDIR}/salt-2019.2.2-newer-deps.patch" |
592 |
- "${FILESDIR}/salt-2019.2.2-workaround-broken-mock-on-py2.patch" |
593 |
- "${FILESDIR}/salt-2019.2.0-remove-raet-tests.patch" |
594 |
- "${FILESDIR}/salt-2019.2.8-ansible-roster-fix.patch" |
595 |
-) |
596 |
- |
597 |
-python_prepare() { |
598 |
- # remove tests with external dependencies that may not be available |
599 |
- rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die |
600 |
- rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die |
601 |
- rm tests/unit/states/test_boto_vpc.py || die |
602 |
- |
603 |
- # breaks with permission errors |
604 |
- rm tests/unit/utils/test_cache.py || die |
605 |
- |
606 |
- # remove raet due to deps being dropped |
607 |
- rm tests/unit/modules/test_raet_publish.py \ |
608 |
- salt/transport/raet.py \ |
609 |
- salt/daemons/test/test_raetkey.py || die |
610 |
- |
611 |
- # allow the use of the renamed msgpack |
612 |
- sed -i '/^msgpack/d' requirements/base.txt || die |
613 |
-} |
614 |
- |
615 |
-python_install_all() { |
616 |
- local svc |
617 |
- USE_SETUPTOOLS=1 distutils-r1_python_install_all |
618 |
- |
619 |
- for svc in minion master syndic api; do |
620 |
- newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} |
621 |
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
622 |
- systemd_dounit "${FILESDIR}"/salt-${svc}.service |
623 |
- done |
624 |
- |
625 |
- insinto /etc/${PN} |
626 |
- doins -r conf/* |
627 |
-} |
628 |
- |
629 |
-python_test() { |
630 |
- local tempdir |
631 |
- # testsuite likes lots of files |
632 |
- ulimit -n 3072 || die |
633 |
- |
634 |
- # ${T} is too long a path for the tests to work |
635 |
- tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" |
636 |
- mkdir "${T}/$(basename "${tempdir}")" |
637 |
- mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die |
638 |
- |
639 |
- ( |
640 |
- cleanup() { rm -f "${tempdir}" || die; } |
641 |
- |
642 |
- trap cleanup EXIT |
643 |
- |
644 |
- addwrite "${tempdir}" |
645 |
- ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die |
646 |
- |
647 |
- USE_SETUPTOOLS=1 SHELL="/bin/bash" \ |
648 |
- TMPDIR="${tempdir}" \ |
649 |
- ${EPYTHON} tests/runtests.py \ |
650 |
- --unit-tests --no-report --verbose \ |
651 |
- || die "testing failed with ${EPYTHON}" |
652 |
- ) |
653 |
-} |