Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/elasticsearch-curator/
Date: Thu, 30 Nov 2017 14:47:18
Message-Id: 1512053186.d5265ac7e4cb7603ecbaa495fbed8ecaed80d07e.monsieurp@gentoo
1 commit: d5265ac7e4cb7603ecbaa495fbed8ecaed80d07e
2 Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
3 AuthorDate: Fri Nov 17 20:19:45 2017 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 30 14:46:26 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5265ac7
7
8 dev-python/elasticsearch-curator: drop old.
9
10 dev-python/elasticsearch-curator/Manifest | 4 -
11 .../elasticsearch-curator-4.2.6.ebuild | 119 --------------------
12 .../elasticsearch-curator-5.2.0.ebuild | 120 ---------------------
13 3 files changed, 243 deletions(-)
14
15 diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest
16 index c19d2ad9e9b..42cd0f855ad 100644
17 --- a/dev-python/elasticsearch-curator/Manifest
18 +++ b/dev-python/elasticsearch-curator/Manifest
19 @@ -1,10 +1,6 @@
20 -DIST elasticsearch-5.1.2.tar.gz 33299777 SHA256 74d752f9a8b46898d306ad169b72f328e17215c0909149e156a576089ef11c42 SHA512 1867626e8a87f11ed109e1325fd1d16c9e0af06ebe6a30c78ea679ab533ab377f5da8ea55af6871be33af226f02187a2aadd77e5e23c097dd24055be21e9d691 WHIRLPOOL 2e9df71c915343e2cc8ad82c59b877f41f5e093cbeba21f471c32cb51a195eccc6223bc48da48bb4af2e6bea9f2539f2e93b866963148f4ca2940ba4466e614e
21 DIST elasticsearch-5.5.1.tar.gz 33476827 SHA256 e0924ae2af5f4435cef009ad3a567169e9653263e7a3b8693dba932698ea7e34 SHA512 9bedd48396cdd6c39c107a7951eba8446b8574493bd44c17a79ba3443670a48b72c053006821cf69dc17bf49ff1c05904db14a07d8a6403b2d2061fc605937bd WHIRLPOOL 770b2eab9d67212fde7bafb5eaa885c13195f3ecb41897c261bac405987397e299d064badda454d12901ed86a8f9a4e87ab0242ccf5f6971005397ad9061f8c6
22 -DIST elasticsearch-5.5.2.tar.gz 33485703 SHA256 0870e2c0c72e6eda976effa07aa1cdd06a9500302320b5c22ed292ce21665bf1 SHA512 62048f15b43e38a61e3a19a1599c25cd0d9009cc1172db5b450b04dec349ecd313b1f20e3d1c7ed1c101ae3e6f6c6d2cdf004a9713ad803576277f93e3adbdb9 WHIRLPOOL 3a71cef2858b76b11e1693907e745912a83f23e26c35a3456c6324fc19c317c53d4404e20134b034e41e162c1ea8d58c38bbd4afe0394d886ab32f6b698172ec
23 DIST elasticsearch-5.6.3.tar.gz 33774486 SHA256 492b7e59d5204b3dc7eb13b611c33b3db36b392bdd6a4c004ba99c6543fc28f9 SHA512 ee57d010e196eb25e5296fe95ab2de5e503d4d66f7eec8c8f6ac2ff9ddbc1a8dc1514202d705e291ee49d3e04650b597a9afc5f92f179b8faa5e2fe3c662f33e WHIRLPOOL bda081e6b91d1076a39e0af75b44d7f877f28178281de1f22c5177abf804c9395dacabb3c93ec93aff65223df42353bc955bbf60e74fb07f99320096dd97173a
24 DIST elasticsearch-6.0.0.tar.gz 28017602 SHA256 0420e877a8b986485244f603770737e9e4e47186fdfa1093768a11e391e3d9f4 SHA512 25bb622d2fc557d8b8eded634a9b333766f7b58e701359e1bcfafee390776eb323cb7ea7a5e02e8803e25d8b1d3aabec0ec1b0cf492d0bab5689686fe440181c WHIRLPOOL 903e2069b6274a47102aa9b3945db545c2b1bf0417747500529439dd70dd98decc953902fd25fb9da8e39d035249927028567caa022942ae2d2295d7dbe33ee3
25 -DIST elasticsearch-curator-4.2.6.tar.gz 228342 SHA256 bebc7f6b53a4147e92004dd63d2349bb18170feed12b9219206d0d074b0643ae SHA512 e42d9f3c6122ba9cfc0bc90323f12d7ebf09902d04138472999b63fc59742f2f461b889dd98fca98f321d4975a3c05bc2aae5d211a774abd49b628ea318f5f64 WHIRLPOOL 63eed5c64f3a08f44d6feb8eb56b7698e8081a948b67daae91bb692d69e3ed1166c2fb867cb61f3f114eed74d05251b3aae68a8c475bf75ce318d53435e27b7e
26 DIST elasticsearch-curator-5.1.2.tar.gz 290616 SHA256 e2f4f6db735223b8bf2bf84924b6edb23d1c3b9a6ebd3ad3bebfcc23f38e0434 SHA512 4ac0ae789fe662d352c3d228acc6aaf78873bb02b7108f985fd0a048d0b90cb2b30572eaa5f984025ab0d4209eda9d6fe6ac66cd8cc856f0707e3f12bb2e574d WHIRLPOOL 143f7b8704d73db92524e25a51074dc96385089aac0c88d197b12668afe10eaf7d686a2d03a1c81dc988a158e6d9e9b9e419b50450d474ec75ef90cc56d502b7
27 -DIST elasticsearch-curator-5.2.0.tar.gz 301134 SHA256 e79e0804b6629fa4669570052379e98d5e10c07879c132e1636f26d6e038c159 SHA512 5aba1c3fb1c76f2389902024190ba23567107e3655987014c9250ae46a9199daaad18cd6e9f2595458bf4abb6ac3d4d76c241907d1c0009eb2a15ef638e99d23 WHIRLPOOL 20ccff30bff5f52d05d5804a660dad35a2908479789bfe1d08052428c7c1352c30cbd11623d603ded8fd37b162252bfc24030731443ae7e120f5de7de88faace
28 DIST elasticsearch-curator-5.3.0.tar.gz 292274 SHA256 241dcda173aa3ba79b2b0f8f8ec31c8729fa0448f710f6cba10d2d20fcaaacf4 SHA512 23a94c0a8b78cd0f3a27af76131c267c407dbafb504a4503e8c954e69cdb527ed334fbfcda068b2f1d28479762c430f665f661f827bdf3066f5bcdd50c82dc53 WHIRLPOOL d37e553ad79b79e5b92271ced40534942b2ef6d75ff62afd7903771d41887c17f1f7fd96219942db2d3d7122c92cef6953cd59a57ad61f9af825fd060ec33428
29 DIST elasticsearch-curator-5.4.0.tar.gz 293915 SHA256 20f15e5ce3448d0505b511813fac3ea82a7665e5a5569522ab1a83b9e8dabf0d SHA512 ce29430e72a5f7d4dce98fff88c4357e3689bf2de3b4d95d56b24908ea9d71d92cdb0be145fa4ecc264b53a5824f2abf808a6b0d82af85967a5d7154e5b1c4aa WHIRLPOOL f944b0a7c0c18cf36138f7994af6365c56ec061a0288c11574d85879061a1fea35d0ddacd0e026d4b3cd8edf348430e1fd34d11b1216dd3d63f379640232820f
30
31 diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-4.2.6.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-4.2.6.ebuild
32 deleted file mode 100644
33 index dd682d809f0..00000000000
34 --- a/dev-python/elasticsearch-curator/elasticsearch-curator-4.2.6.ebuild
35 +++ /dev/null
36 @@ -1,119 +0,0 @@
37 -# Copyright 1999-2017 Gentoo Foundation
38 -# Distributed under the terms of the GNU General Public License v2
39 -
40 -EAPI=6
41 -
42 -PYTHON_COMPAT=( python{2_7,3_4,3_5} )
43 -
44 -MY_PN="curator"
45 -ES_VERSION="5.1.2"
46 -
47 -inherit distutils-r1
48 -
49 -DESCRIPTION="Tending time-series indices in Elasticsearch"
50 -HOMEPAGE="https://github.com/elasticsearch/curator"
51 -SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
52 - test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
53 -
54 -LICENSE="Apache-2.0"
55 -SLOT="0"
56 -KEYWORDS="amd64 x86"
57 -IUSE="doc test"
58 -
59 -RDEPEND="
60 - >=dev-python/elasticsearch-py-2.4.0[${PYTHON_USEDEP}]
61 - <dev-python/elasticsearch-py-3.0.0[${PYTHON_USEDEP}]
62 - >=dev-python/click-6.0[${PYTHON_USEDEP}]
63 - >=dev-python/certifi-2017.1.23[${PYTHON_USEDEP}]
64 - >=dev-python/urllib3-1.8.3[${PYTHON_USEDEP}]
65 - >=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
66 -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
67 - dev-python/sphinx[${PYTHON_USEDEP}]
68 - >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
69 - test? ( ${RDEPEND}
70 - virtual/jre:1.8
71 - dev-python/mock[${PYTHON_USEDEP}]
72 - dev-python/nose[${PYTHON_USEDEP}]
73 - dev-python/coverage[${PYTHON_USEDEP}]
74 - dev-python/nosexcover[${PYTHON_USEDEP}]
75 - dev-python/six[${PYTHON_USEDEP}] )"
76 -
77 -S="${WORKDIR}/${MY_PN}-${PV}"
78 -
79 -# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
80 -python_test() {
81 - ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
82 - ES_PORT="25123"
83 - ES_INSTANCE="gentoo-es-curator-test"
84 - ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
85 - PID="${ES}/elasticsearch.pid"
86 -
87 - # run Elasticsearch instance on custom port
88 - sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
89 - s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
90 - "${ES}/config/elasticsearch.yml" || die
91 -
92 - # start local instance of elasticsearch
93 - "${ES}/bin/elasticsearch" -d -p "${PID}" -Edefault.path.repo=/ || die
94 -
95 - local i
96 - local es_started=0
97 - for i in {1..15}; do
98 - grep -q "started" "${ES_LOG}" 2> /dev/null
99 - if [[ $? -eq 0 ]]; then
100 - einfo "Elasticsearch started"
101 - es_started=1
102 - eend 0
103 - break
104 - elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
105 - eend 1
106 - eerror "Elasticsearch already running"
107 - die "Cannot start Elasticsearch for tests"
108 - else
109 - einfo "Waiting for Elasticsearch"
110 - eend 1
111 - sleep 2
112 - continue
113 - fi
114 - done
115 -
116 - [[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
117 -
118 - export TEST_ES_SERVER="localhost:${ES_PORT}"
119 - esetup.py test || die
120 -
121 - pkill -F ${PID}
122 -}
123 -
124 -python_prepare_all() {
125 - # avoid downloading from net
126 - sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
127 -
128 - # remove test TestCLIFixFor687 as it is only to be run on older versions
129 - # and the call to curator.get_version(global_client) sometimes
130 - # fails with Connection refused
131 - sed -e '122,205d' -i test/integration/test_delete_indices.py || die
132 -
133 - distutils-r1_python_prepare_all
134 -}
135 -
136 -python_compile_all() {
137 - cd docs || die
138 - emake man $(usex doc html "")
139 -}
140 -
141 -python_install_all() {
142 - use doc && local HTML_DOCS=( docs/_build/html/. )
143 - doman docs/_build/man/*
144 - distutils-r1_python_install_all
145 -}
146 -
147 -pkg_postinst() {
148 - ewarn ""
149 - ewarn "For Python 3 support information please read: http://click.pocoo.org/3/python3/"
150 - ewarn ""
151 - ewarn "Example usage on Python 3:"
152 - ewarn "export LC_ALL=en_US.UTF-8"
153 - ewarn "export LANG=en_US.UTF-8"
154 - ewarn "curator ..."
155 -}
156
157 diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.2.0.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.2.0.ebuild
158 deleted file mode 100644
159 index 1da55699678..00000000000
160 --- a/dev-python/elasticsearch-curator/elasticsearch-curator-5.2.0.ebuild
161 +++ /dev/null
162 @@ -1,120 +0,0 @@
163 -# Copyright 1999-2017 Gentoo Foundation
164 -# Distributed under the terms of the GNU General Public License v2
165 -
166 -EAPI=6
167 -
168 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
169 -
170 -MY_PN="curator"
171 -ES_VERSION="5.5.2"
172 -
173 -# tests fail in chroot
174 -# https://github.com/elastic/elasticsearch/issues/12018
175 -RESTRICT="test"
176 -
177 -# running tests in non-chroot environments:
178 -# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
179 -
180 -inherit distutils-r1
181 -
182 -DESCRIPTION="Tending time-series indices in Elasticsearch"
183 -HOMEPAGE="https://github.com/elasticsearch/curator"
184 -SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
185 - test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
186 -
187 -LICENSE="Apache-2.0"
188 -SLOT="0"
189 -KEYWORDS="~amd64 ~x86"
190 -IUSE="doc test"
191 -
192 -RDEPEND="
193 - >=dev-python/elasticsearch-py-5.4.0[${PYTHON_USEDEP}]
194 - <dev-python/elasticsearch-py-6.0.0[${PYTHON_USEDEP}]
195 - >=dev-python/click-6.7[${PYTHON_USEDEP}]
196 - >=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
197 - >=dev-python/urllib3-1.20[${PYTHON_USEDEP}]
198 - >=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
199 -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
200 - dev-python/sphinx[${PYTHON_USEDEP}]
201 - >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
202 - test? ( ${RDEPEND}
203 - virtual/jre:1.8
204 - dev-python/mock[${PYTHON_USEDEP}]
205 - dev-python/nose[${PYTHON_USEDEP}]
206 - dev-python/coverage[${PYTHON_USEDEP}]
207 - dev-python/nosexcover[${PYTHON_USEDEP}]
208 - dev-python/six[${PYTHON_USEDEP}] )"
209 -
210 -S="${WORKDIR}/${MY_PN}-${PV}"
211 -
212 -python_test() {
213 - ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
214 - ES_PORT="25123"
215 - ES_INSTANCE="gentoo-es-curator-test"
216 - ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
217 - PID="${ES}/elasticsearch.pid"
218 -
219 - # run Elasticsearch instance on custom port
220 - sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
221 - s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
222 - "${ES}/config/elasticsearch.yml" || die
223 -
224 - # start local instance of elasticsearch
225 - "${ES}/bin/elasticsearch" -d -p "${PID}" -Epath.repo=/ || die
226 -
227 - local i
228 - local es_started=0
229 - for i in {1..20}; do
230 - grep -q "started" "${ES_LOG}" 2> /dev/null
231 - if [[ $? -eq 0 ]]; then
232 - einfo "Elasticsearch started"
233 - es_started=1
234 - eend 0
235 - break
236 - elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
237 - eend 1
238 - eerror "Elasticsearch already running"
239 - die "Cannot start Elasticsearch for tests"
240 - else
241 - einfo "Waiting for Elasticsearch"
242 - eend 1
243 - sleep 2
244 - continue
245 - fi
246 - done
247 -
248 - [[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
249 -
250 - export TEST_ES_SERVER="localhost:${ES_PORT}"
251 - esetup.py test || die
252 -
253 - pkill -F ${PID}
254 -}
255 -
256 -python_prepare_all() {
257 - # avoid downloading from net
258 - sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
259 -
260 - distutils-r1_python_prepare_all
261 -}
262 -
263 -python_compile_all() {
264 - cd docs || die
265 - emake -j1 man $(usex doc html "")
266 -}
267 -
268 -python_install_all() {
269 - use doc && local HTML_DOCS=( docs/_build/html/. )
270 - doman docs/_build/man/*
271 - distutils-r1_python_install_all
272 -}
273 -
274 -pkg_postinst() {
275 - ewarn ""
276 - ewarn "For Python 3 support information please read: http://click.pocoo.org/latest/python3/"
277 - ewarn ""
278 - ewarn "Example usage on Python 3:"
279 - ewarn "export LC_ALL=en_US.UTF-8"
280 - ewarn "export LANG=en_US.UTF-8"
281 - ewarn "curator ..."
282 -}