1 |
commit: a5da849d9276e29315f17f643ddc573df9fd43e4 |
2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
3 |
AuthorDate: Wed Jun 9 22:26:46 2021 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 9 22:27:02 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5da849d |
7 |
|
8 |
app-admin/salt-3000.9: Version bump |
9 |
|
10 |
Copyright: Sony Interactive Entertainment Inc. |
11 |
Package-Manager: Portage-3.0.19, Repoman-3.0.3 |
12 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
13 |
|
14 |
app-admin/salt/Manifest | 1 + |
15 |
app-admin/salt/files/salt-3000.9-tests.patch | 12 ++ |
16 |
app-admin/salt/salt-3000.9.ebuild | 203 +++++++++++++++++++++++++++ |
17 |
3 files changed, 216 insertions(+) |
18 |
|
19 |
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest |
20 |
index f47131ca6e5..cc3b4f7d734 100644 |
21 |
--- a/app-admin/salt/Manifest |
22 |
+++ b/app-admin/salt/Manifest |
23 |
@@ -1,5 +1,6 @@ |
24 |
DIST salt-3000.2-py38-misc.patch.gz 6250 BLAKE2B 68fff80a042e6bf208ea2d9692da7a7b1e29572f1ec3c850c14743bbf2821d231f933ec4e6d6eaad12acee0b7666888a37a72872b2b082c92d8db9de988fbbec SHA512 6d4a66323a423e630f7cc73b566ed96c452c8fc3d72c25a2dd86033c4774c1c8e8b8701e1d4ee92994d4148c398d704f419023e26d8b40c8fdd63f9d79d9d52f |
25 |
DIST salt-3000.8.tar.gz 15249139 BLAKE2B df306669ba11dd650621222ff9c69f5a6e16b6f431e9d93e6712ee95da43091bfe28416fe0d71988ed9ee70cb347755b779a356c50fa59c63c67a874ed1906f4 SHA512 a18d5bea3b3835f83d5b1e5315990d83f6c58c36df5589d5de0f8cc3a46db4c960b58032e29d56841a160b9b170cdbb81bca38dbbd72ccb5866ccc8a7da6e800 |
26 |
+DIST salt-3000.9.tar.gz 15250432 BLAKE2B b76c166363b0b0fd3e3aa4b5306ba8280a2c99fbc7fd9866d957406bba8e6fcc03b769b53dbb80b115f9fa9f1fdc93e1eb257f4bf04283e414a309c16e4f078f SHA512 94214f20a8a080ebdcbb7e3351f60a466c3a92cc85d177c2ea677192a63e58b0f9cacfb1af04e14022a7ac570ebd0b931722d1d001a7655dcd7502813c29a092 |
27 |
DIST salt-3001.6.tar.gz 15736056 BLAKE2B 00e7674452e9d61c3cd487d27a3a1f3435c6b12dcc89008aa63c96814957b6ce8654f4d4d51dbce7b14027f0cee66fd2ea9602f6be18bf2f4beac11ae164f89f SHA512 e45c9cfddb64ab1c9d66b6b6b3e5ff8d9010c01307161e5013140b4362ee630cf912ab153d1afa72f56d18fc5353293b2f4b449caf8ee384d1e93204d490bf4c |
28 |
DIST salt-3002.5.tar.gz 15784880 BLAKE2B baa90bb0caea572dfbe12d92fb488ee0c4adef9a07221f394009cd43a62ffef18c57f2e7cdcfcd923807c7a3d02ce6833480f74d70250c29d311420f30514300 SHA512 dda2caa338f646ec51d2de6b0df10fbb27eceddbe8c797ae192b9ef1312d566ae71a243a3a95918fa375b125089aa29a73b1b908c5cc1b0451dccb582a4978a1 |
29 |
DIST salt-3003.tar.gz 15830910 BLAKE2B ea4f02eece951c3fb4fcc480d00f7b531ac549b2e23ff9a210b73f749f9ba83e0402e02a59028f41f94958d17512e417b7c1b7015e8ee3aeac55be9b1374fe6f SHA512 7f631466372f303c03f2852a5cfba1ee5c6ba1636a6fe1e1622e90d0b1376ef9f670aa1b4754f3d9c8c7fe1b99fe1b4c49e140dc86d90d157a1ec1e73ba43c38 |
30 |
|
31 |
diff --git a/app-admin/salt/files/salt-3000.9-tests.patch b/app-admin/salt/files/salt-3000.9-tests.patch |
32 |
new file mode 100644 |
33 |
index 00000000000..9b7a1786e72 |
34 |
--- /dev/null |
35 |
+++ b/app-admin/salt/files/salt-3000.9-tests.patch |
36 |
@@ -0,0 +1,12 @@ |
37 |
+diff --git a/tests/unit/modules/test_cmdmod.py b/tests/unit/modules/test_cmdmod.py |
38 |
+index 2d88706b49..ec8b623f5b 100644 |
39 |
+--- a/tests/unit/modules/test_cmdmod.py |
40 |
++++ b/tests/unit/modules/test_cmdmod.py |
41 |
+@@ -509,6 +509,7 @@ class CMDMODTestCase(TestCase, LoaderModuleMockMixin): |
42 |
+ self.assertEqual(ret['stdout'], |
43 |
+ salt.utils.stringutils.to_unicode(stdout)) |
44 |
+ |
45 |
++ @skipIf(True, "Not happy in sandbox") |
46 |
+ def test_run_all_output_loglevel_debug(self): |
47 |
+ ''' |
48 |
+ Test that specifying debug for loglevel |
49 |
|
50 |
diff --git a/app-admin/salt/salt-3000.9.ebuild b/app-admin/salt/salt-3000.9.ebuild |
51 |
new file mode 100644 |
52 |
index 00000000000..9818e6b40a9 |
53 |
--- /dev/null |
54 |
+++ b/app-admin/salt/salt-3000.9.ebuild |
55 |
@@ -0,0 +1,203 @@ |
56 |
+# Copyright 1999-2021 Gentoo Authors |
57 |
+# Distributed under the terms of the GNU General Public License v2 |
58 |
+ |
59 |
+EAPI=7 |
60 |
+PYTHON_COMPAT=( python3_{7..8} ) |
61 |
+ |
62 |
+inherit systemd distutils-r1 |
63 |
+ |
64 |
+DESCRIPTION="Salt is a remote execution and configuration manager" |
65 |
+HOMEPAGE="https://www.saltstack.com/resources/community/ |
66 |
+ https://github.com/saltstack" |
67 |
+ |
68 |
+if [[ ${PV} == 9999* ]]; then |
69 |
+ inherit git-r3 |
70 |
+ EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" |
71 |
+ EGIT_BRANCH="develop" |
72 |
+ SRC_URI="" |
73 |
+else |
74 |
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz |
75 |
+ https://dev.gentoo.org/~chutzpah/dist/salt/salt-3000.2-py38-misc.patch.gz" |
76 |
+ KEYWORDS="~amd64 ~x86" |
77 |
+fi |
78 |
+ |
79 |
+LICENSE="Apache-2.0" |
80 |
+SLOT="0" |
81 |
+IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako |
82 |
+ mongodb neutron nova openssl portage profile redis selinux test raet |
83 |
+ +zeromq vim-syntax" |
84 |
+ |
85 |
+RDEPEND=" |
86 |
+ sys-apps/pciutils |
87 |
+ dev-python/distro[${PYTHON_USEDEP}] |
88 |
+ dev-python/jinja[${PYTHON_USEDEP}] |
89 |
+ dev-python/libnacl[${PYTHON_USEDEP}] |
90 |
+ >=dev-python/msgpack-0.5[${PYTHON_USEDEP}] |
91 |
+ <dev-python/msgpack-1.0[${PYTHON_USEDEP}] |
92 |
+ dev-python/pycryptodome[${PYTHON_USEDEP}] |
93 |
+ dev-python/pyyaml[${PYTHON_USEDEP}] |
94 |
+ dev-python/markupsafe[${PYTHON_USEDEP}] |
95 |
+ >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
96 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
97 |
+ libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
98 |
+ mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
99 |
+ ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
100 |
+ libvirt? ( |
101 |
+ $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) |
102 |
+ ) |
103 |
+ openssl? ( |
104 |
+ dev-libs/openssl:0=[-bindist] |
105 |
+ dev-python/pyopenssl[${PYTHON_USEDEP}] |
106 |
+ ) |
107 |
+ raet? ( |
108 |
+ >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
109 |
+ >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
110 |
+ >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
111 |
+ ) |
112 |
+ cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
113 |
+ cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] ) |
114 |
+ mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
115 |
+ portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
116 |
+ keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
117 |
+ redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
118 |
+ selinux? ( sec-policy/selinux-salt ) |
119 |
+ nova? ( |
120 |
+ $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8) |
121 |
+ ) |
122 |
+ neutron? ( |
123 |
+ $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8) |
124 |
+ ) |
125 |
+ gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
126 |
+ profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
127 |
+ vim-syntax? ( app-vim/salt-vim ) |
128 |
+ zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] ) |
129 |
+" |
130 |
+BDEPEND=" |
131 |
+ test? ( |
132 |
+ ${RDEPEND} |
133 |
+ >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
134 |
+ >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] |
135 |
+ >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] |
136 |
+ >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] |
137 |
+ >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
138 |
+ dev-python/pip[${PYTHON_USEDEP}] |
139 |
+ dev-python/psutil[${PYTHON_USEDEP}] |
140 |
+ dev-python/pytest[${PYTHON_USEDEP}] |
141 |
+ dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] |
142 |
+ dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] |
143 |
+ >=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}] |
144 |
+ dev-python/pytest-tempdir[${PYTHON_USEDEP}] |
145 |
+ >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] |
146 |
+ dev-python/virtualenv[${PYTHON_USEDEP}] |
147 |
+ !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] ) |
148 |
+ )" |
149 |
+ |
150 |
+DOCS=( README.rst AUTHORS ) |
151 |
+ |
152 |
+REQUIRED_USE="|| ( raet zeromq ) |
153 |
+ test? ( cheetah genshi )" |
154 |
+RESTRICT="!test? ( test ) x86? ( test )" |
155 |
+ |
156 |
+# tests failing with newer versions of deps |
157 |
+#RESTRICT+=" test" |
158 |
+ |
159 |
+PATCHES=( |
160 |
+ "${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch" |
161 |
+ "${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch" |
162 |
+ "${FILESDIR}/salt-3000.1-tests.patch" |
163 |
+ "${FILESDIR}/salt-3000.2-tests.patch" |
164 |
+ "${FILESDIR}/salt-3000.9-tests.patch" |
165 |
+ |
166 |
+ # https://github.com/saltstack/salt/pull/55410 |
167 |
+ "${FILESDIR}/salt-3000.2-py38.patch" |
168 |
+ |
169 |
+ # https://github.com/saltstack/salt/pull/55900 |
170 |
+ "${FILESDIR}/salt-3000.2-py38-abc.patch" |
171 |
+ |
172 |
+ # misc py38 fixups |
173 |
+ "${WORKDIR}/salt-3000.2-py38-misc.patch" |
174 |
+ "${FILESDIR}/salt-3000.2-py38-logwarn.patch" |
175 |
+ "${FILESDIR}/salt-2019.2.8-ansible-roster-fix.patch" |
176 |
+) |
177 |
+ |
178 |
+python_prepare_all() { |
179 |
+ # remove tests with external dependencies that may not be available, and |
180 |
+ # tests that don't work in sandbox |
181 |
+ rm tests/unit/{test_zypp_plugins,utils/test_{extend,cache}}.py || die |
182 |
+ rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die |
183 |
+ rm tests/unit/states/test_boto_vpc.py tests/unit/test_module_names.py || die |
184 |
+ |
185 |
+ # tests that require network access |
186 |
+ rm tests/unit/{states,modules}/test_zcbuildout.py || die |
187 |
+ rm tests/unit/transport/test_zeromq.py || die |
188 |
+ |
189 |
+ # make sure pkg_resources doesn't bomb because pycrypto isn't installed |
190 |
+ find . -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d' -i || die |
191 |
+ distutils-r1_python_prepare_all |
192 |
+} |
193 |
+ |
194 |
+python_prepare() { |
195 |
+ einfo "Fixing collections.abc warnings for ${EPYTHON}" |
196 |
+ local abc |
197 |
+ abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die |
198 |
+ find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die |
199 |
+ |
200 |
+ # allow the use of the renamed msgpack |
201 |
+ sed -i '/^msgpack/d' requirements/base.txt || die |
202 |
+} |
203 |
+ |
204 |
+python_install_all() { |
205 |
+ local svc |
206 |
+ USE_SETUPTOOLS=1 distutils-r1_python_install_all |
207 |
+ |
208 |
+ for svc in minion master syndic api; do |
209 |
+ newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} |
210 |
+ newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
211 |
+ systemd_dounit "${FILESDIR}"/salt-${svc}.service |
212 |
+ done |
213 |
+ |
214 |
+ insinto /etc/${PN} |
215 |
+ doins -r conf/* |
216 |
+} |
217 |
+ |
218 |
+python_test() { |
219 |
+ local tempdir |
220 |
+ # testsuite likes lots of files |
221 |
+ ulimit -n 3072 || die |
222 |
+ |
223 |
+ # ${T} is too long a path for the tests to work |
224 |
+ tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" |
225 |
+ mkdir "${T}/$(basename "${tempdir}")" |
226 |
+ |
227 |
+ ( |
228 |
+ cleanup() { rm -f "${tempdir}" || die; } |
229 |
+ |
230 |
+ trap cleanup EXIT |
231 |
+ |
232 |
+ addwrite "${tempdir}" |
233 |
+ ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die |
234 |
+ |
235 |
+ USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ |
236 |
+ TMPDIR="${tempdir}" \ |
237 |
+ ${EPYTHON} tests/runtests.py \ |
238 |
+ --unit-tests --no-report --verbose \ |
239 |
+ || die "testing failed with ${EPYTHON}" |
240 |
+ ) |
241 |
+} |
242 |
+ |
243 |
+pkg_postinst() { |
244 |
+ if use python_targets_python3_8; then |
245 |
+ if use nova; then |
246 |
+ ewarn "Salt's nova functionality will not work with python3.8 since" |
247 |
+ ewarn "dev-python/python-novaclient does not support it yet" |
248 |
+ fi |
249 |
+ if use neutron; then |
250 |
+ ewarn "Salt's neutron functionality will not work with python3.8 since" |
251 |
+ ewarn "dev-python/python-neutronclient does not support it yet" |
252 |
+ fi |
253 |
+ if use libvirt; then |
254 |
+ ewarn "Salt's libvirt functionality will not work with python3.8 since" |
255 |
+ ewarn "dev-python/libvirt-python does not support it yet" |
256 |
+ fi |
257 |
+ fi |
258 |
+} |