Gentoo Archives: gentoo-commits

From: Patrick McLean <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/salt/
Date: Tue, 10 Mar 2020 20:30:57
Message-Id: 1583872226.fb039e5c21b2e770a784cc87eb9d4f8ec7c0a9f3.chutzpah@gentoo
1 commit: fb039e5c21b2e770a784cc87eb9d4f8ec7c0a9f3
2 Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 10 20:30:26 2020 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 10 20:30:26 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb039e5c
7
8 app-admin/salt-2019.2.3: Version bump
9
10 Package-Manager: Portage-2.3.93, Repoman-2.3.20
11 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
12
13 app-admin/salt/Manifest | 1 +
14 app-admin/salt/salt-2019.2.3.ebuild | 151 ++++++++++++++++++++++++++++++++++++
15 2 files changed, 152 insertions(+)
16
17 diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
18 index 72e7e1a90e3..ce151f7de7f 100644
19 --- a/app-admin/salt/Manifest
20 +++ b/app-admin/salt/Manifest
21 @@ -1,3 +1,4 @@
22 DIST salt-2018.3.4.tar.gz 14404085 BLAKE2B 932b30b1ba60aefd3a6874a8ebe4cb6c469d82e31f6acdbe8a5641d09e3316796b5403ef803a355cec6255c1aede8bac3b66af179bd1bbaa5418c7076229cef9 SHA512 f17e06fdbf4741f231d9e769be57de4f6079e9283881b4bafa0d23928d7626a1f9c02b9f49c654b29c3e6ee8ed3d3ddf42c21baecef158ad63a97dc87895b21b
23 DIST salt-2019.2.0.tar.gz 14952746 BLAKE2B aa3bba4b7d9548a8d333c242fc0265a743f56ff1a259da7c8618d37b3b022e12f09ac594a09f0ceec80fd9d3a6b6b9ec35b33e879b7a124e6612f2ec2a63a01c SHA512 de5a976213d011c230e423a172952effddb87168367958b8657eaaaf8fd2a8bec8471f547b6ff9e896a17064a13d387dbc12e12c605c8a241062e3238bd19eca
24 DIST salt-2019.2.2.tar.gz 14420887 BLAKE2B 84e8a0aa72b88a66a1020b695849926669728ee02f8cb51a14853b5e9c2ab692fe65810367e5d53268f7b234c10911f16d063ce665b3761432ab1d9c0aa52d16 SHA512 2bbf9765384f1f6c2336a3f421298c8900cf459e6d1ebc7fb89284014ef8db9f5215a68de2bb06dfa3404983160a0c4c589ffa3dc046611dd5409bd502938677
25 +DIST salt-2019.2.3.tar.gz 14572686 BLAKE2B 770b815f43ca8651408c1c057377b02c8037e673584c719e0a9b5c56c13c8db2db0e2c8641a17323f2b890d4a69d1508b0090624c7067869d9fa84303c2f8585 SHA512 cd694ca19696a84e3370e39c61da180e508592253713d99dd6dd5342b57c2814fee22e46bade30d7604f5730d9e1a736e59c3a512161f744d3f097f74a2836c5
26
27 diff --git a/app-admin/salt/salt-2019.2.3.ebuild b/app-admin/salt/salt-2019.2.3.ebuild
28 new file mode 100644
29 index 00000000000..4d23bf4acba
30 --- /dev/null
31 +++ b/app-admin/salt/salt-2019.2.3.ebuild
32 @@ -0,0 +1,151 @@
33 +# Copyright 1999-2020 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=7
37 +PYTHON_COMPAT=( python3_6 )
38 +
39 +inherit eutils systemd distutils-r1
40 +
41 +DESCRIPTION="Salt is a remote execution and configuration manager"
42 +HOMEPAGE="https://www.saltstack.com/resources/community/
43 + https://github.com/saltstack"
44 +
45 +if [[ ${PV} == 9999* ]]; then
46 + inherit git-r3
47 + EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
48 + EGIT_BRANCH="develop"
49 + SRC_URI=""
50 + KEYWORDS=""
51 +else
52 + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
53 + KEYWORDS="~amd64 ~x86"
54 +fi
55 +
56 +LICENSE="Apache-2.0"
57 +SLOT="0"
58 +IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb neutron nova"
59 +IUSE+=" openssl portage profile redis selinux test raet +zeromq vim-syntax"
60 +
61 +RDEPEND="sys-apps/pciutils
62 + dev-python/jinja[${PYTHON_USEDEP}]
63 + dev-python/libnacl[${PYTHON_USEDEP}]
64 + >=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
65 + dev-python/pyyaml[${PYTHON_USEDEP}]
66 + dev-python/markupsafe[${PYTHON_USEDEP}]
67 + >=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
68 + dev-python/setuptools[${PYTHON_USEDEP}]
69 + >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
70 + <www-servers/tornado-5.0[${PYTHON_USEDEP}]
71 + virtual/python-futures[${PYTHON_USEDEP}]
72 + libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
73 + mako? ( dev-python/mako[${PYTHON_USEDEP}] )
74 + ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
75 + libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
76 + openssl? (
77 + dev-libs/openssl:0=[-bindist]
78 + dev-python/pyopenssl[${PYTHON_USEDEP}]
79 + )
80 + raet? (
81 + >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
82 + >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
83 + >=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
84 + )
85 + zeromq? (
86 + >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
87 + dev-python/pycryptodome[${PYTHON_USEDEP}]
88 + )
89 + cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
90 + mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
91 + portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
92 + keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
93 + redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
94 + selinux? ( sec-policy/selinux-salt )
95 + nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
96 + neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
97 + gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
98 + profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
99 + vim-syntax? ( app-vim/salt-vim )"
100 +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
101 + test? (
102 + >=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}]
103 + >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
104 + dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
105 + dev-python/psutil[${PYTHON_USEDEP}]
106 + dev-python/pytest[${PYTHON_USEDEP}]
107 + dev-python/pytest-catchlog[${PYTHON_USEDEP}]
108 + dev-python/pip[${PYTHON_USEDEP}]
109 + dev-python/virtualenv[${PYTHON_USEDEP}]
110 + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
111 + >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
112 + !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
113 + >=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
114 + >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
115 + >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
116 + ${RDEPEND}
117 + )"
118 +
119 +DOCS=( README.rst AUTHORS )
120 +
121 +REQUIRED_USE="|| ( raet zeromq )"
122 +RESTRICT="!test? ( test ) x86? ( test )"
123 +
124 +PATCHES=(
125 + "${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch"
126 + "${FILESDIR}/salt-2019.2.0-tests.patch"
127 + "${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
128 + "${FILESDIR}/salt-2019.2.2-newer-deps.patch"
129 + "${FILESDIR}/salt-2019.2.2-workaround-broken-mock-on-py2.patch"
130 +)
131 +
132 +python_prepare() {
133 + # remove tests with external dependencies that may not be available
134 + rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
135 + rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
136 + rm tests/unit/states/test_boto_vpc.py || die
137 +
138 + # allow the use of the renamed msgpack
139 + sed -i '/^msgpack/d' requirements/base.txt || die
140 +}
141 +
142 +python_install_all() {
143 + local svc
144 + USE_SETUPTOOLS=1 distutils-r1_python_install_all
145 +
146 + for svc in minion master syndic api; do
147 + newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
148 + newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
149 + systemd_dounit "${FILESDIR}"/salt-${svc}.service
150 + done
151 +
152 + insinto /etc/${PN}
153 + doins -r conf/*
154 +}
155 +
156 +python_test() {
157 + local tempdir
158 + # testsuite likes lots of files
159 + ulimit -n 3072 || die
160 +
161 + # ${T} is too long a path for the tests to work
162 + tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
163 + mkdir "${T}/$(basename "${tempdir}")"
164 + mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
165 +
166 + (
167 + cleanup() {
168 + rm -f "${tempdir}"
169 + rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
170 + }
171 +
172 + trap cleanup EXIT
173 +
174 + addwrite "${tempdir}"
175 + ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
176 +
177 + USE_SETUPTOOLS=1 SHELL="/bin/bash" \
178 + TMPDIR="${tempdir}" \
179 + ${EPYTHON} tests/runtests.py \
180 + --unit-tests --no-report --verbose
181 +
182 + ) || die "testing failed"
183 +}