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-py/
Date: Thu, 30 Nov 2017 14:47:08
Message-Id: 1512053181.ef52136f9984630a9354ca8a4cf5c7e551a818c4.monsieurp@gentoo
1 commit: ef52136f9984630a9354ca8a4cf5c7e551a818c4
2 Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
3 AuthorDate: Fri Nov 17 20:16:40 2017 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 30 14:46:21 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef52136f
7
8 dev-python/elasticsearch-py: drop old.
9
10 dev-python/elasticsearch-py/Manifest | 11 ---
11 .../elasticsearch-py/elasticsearch-py-2.3.0.ebuild | 89 --------------------
12 .../elasticsearch-py/elasticsearch-py-2.4.1.ebuild | 93 --------------------
13 .../elasticsearch-py/elasticsearch-py-5.0.1.ebuild | 92 --------------------
14 .../elasticsearch-py/elasticsearch-py-5.1.0.ebuild | 93 --------------------
15 .../elasticsearch-py/elasticsearch-py-5.2.0.ebuild | 98 ----------------------
16 .../elasticsearch-py/elasticsearch-py-5.3.0.ebuild | 98 ----------------------
17 7 files changed, 574 deletions(-)
18
19 diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
20 index 0052b7917f7..96b44da794a 100644
21 --- a/dev-python/elasticsearch-py/Manifest
22 +++ b/dev-python/elasticsearch-py/Manifest
23 @@ -1,17 +1,6 @@
24 -DIST elasticsearch-2.2.1.tar.gz 29424648 SHA256 7d43d18a8ee8d715d827ed26b4ff3d939628f5a5b654c6e8de9d99bf3a9b2e03 SHA512 9254175afff5c002625465fb5f398e4e53d121925a656af13e65d90eb3b3ef7507ef094cf44002f104a84e5147a8677a05f4071248140d6b48179b9057867cb5 WHIRLPOOL a470a663b8ec1b8cb7a8daf6bfc02ed7d5d0f23caab063ac2e6c7456bda449bad3e81237699fa434f077d4f86ee09dac7d007b554acc6428f2b436cf8448b210
25 -DIST elasticsearch-2.4.4.tar.gz 27343272 SHA256 981092e6ca65ba5560b8b97a74e5ed0eb2236e9128efdb85bb652cec340158e2 SHA512 899a4d2fc64548bcd488ece223f5f189dfb191eceb36390c4b9d8d0d90ef9d2cb67ada475223b9b2e0bd0fb521a4ab978bc7f60781195927e36d027925338c14 WHIRLPOOL 1a90bb8c923a9eab6cc4390b3daaa44cd85d5c1a3a1a5ef7d274050eb25b061a11a91b0f57ebe9f3cb27aafee3267af8f63ca87837f79d622ff362fbc5b6ae1a
26 -DIST elasticsearch-5.1.1.tar.gz 33291322 SHA256 cd45bafb1f74a7df9bad12c77b7bf3080069266bcbe0b256b0959ef2536e31e8 SHA512 2b5faf97c5ff41a9f12e21749d60f3632b39987d4886713ee9646110acdd17323d263168980d7dd4035732556b604acd68dc37ae7b805d84493075776b9d7bcd WHIRLPOOL ebb46d4a5643f09c0c903055c407a54d46264347924ca37cc73adfee3dd8a9bf2157b1be92b9b1d85636ea92b2d1f89d558c5413c804412996ea9bce42f1c3c6
27 -DIST elasticsearch-5.1.2.tar.gz 33299777 SHA256 74d752f9a8b46898d306ad169b72f328e17215c0909149e156a576089ef11c42 SHA512 1867626e8a87f11ed109e1325fd1d16c9e0af06ebe6a30c78ea679ab533ab377f5da8ea55af6871be33af226f02187a2aadd77e5e23c097dd24055be21e9d691 WHIRLPOOL 2e9df71c915343e2cc8ad82c59b877f41f5e093cbeba21f471c32cb51a195eccc6223bc48da48bb4af2e6bea9f2539f2e93b866963148f4ca2940ba4466e614e
28 -DIST elasticsearch-5.2.1.tar.gz 33516684 SHA256 f28bfecbb8896bbcf8c6063a474a2ddee29a262c216f56ff6d524fc898094475 SHA512 aa8734c1e1111987d45e8dd64b5f8a0473955c48e09e6f1875e877090c21070fc18768b413e7b0c20652cec9ebd9bb6836a2c014cf8159b041f0d22b28ad5a08 WHIRLPOOL 3cf8672facaf03149c4c6119d869d12c2f96fa3c4ce413bfd9b0c940cd90a54c1d87ca915cdb5d9bc9a86135d6efe7891fe6932538020488ef6b3bbc3fd37115
29 DIST elasticsearch-5.3.2.tar.gz 33704368 SHA256 a94fe46bc90eb271a0d448d20e49cb02526ac032281c683c79a219240280a1e8 SHA512 430021202fd747ea376e36e9035f05eaa27f06c25f2f8616e218a248f0aeaaffd8577d689c790b618e3fdbcbae23b7bd664d4380d0e323483f6e158675a4bc00 WHIRLPOOL 0fee048029880dabe901c0f9842ac331ef78204a70d0c71993cddbb8e76b7614af0e4b8e8181b36b9039b64093c9fd0720f5c8a2e7c515fc6634ac465c5f283a
30 DIST elasticsearch-5.6.4.tar.gz 33776770 SHA256 1098fc776fae8c74e65f8e17cf2ea244c1d07c4e6711340c9bb9f6df56aa45b0 SHA512 37730f39cf1711b6a20861370ef7aff4b48e7f90ad82cb1c8c92643179194c4dcdf0180691d8065304bf61e7f5a2fb1ed5c84c384e0b2ff7ad0dc58ac7352f47 WHIRLPOOL 37f1a615a7916738bb8f4809213edced96aaecf3d93df8cad0bc175c71191a6f1d3d616fc40b71e647b65e4c2e03f4f6ab9a4ff333b55d3728ca100b2181edbc
31 DIST elasticsearch-6.0.0.tar.gz 28017602 SHA256 0420e877a8b986485244f603770737e9e4e47186fdfa1093768a11e391e3d9f4 SHA512 25bb622d2fc557d8b8eded634a9b333766f7b58e701359e1bcfafee390776eb323cb7ea7a5e02e8803e25d8b1d3aabec0ec1b0cf492d0bab5689686fe440181c WHIRLPOOL 903e2069b6274a47102aa9b3945db545c2b1bf0417747500529439dd70dd98decc953902fd25fb9da8e39d035249927028567caa022942ae2d2295d7dbe33ee3
32 -DIST elasticsearch-py-2.3.0.tar.gz 74954 SHA256 3610d3a2d2f4eb1906794276ac6fca1ad801067e0f36d71a8a11c2c9112ed120 SHA512 53ffc265dc2c42ef983bf12a6d6bfcb96a378da97c58b52ff872968e50f01936815f2d28d667d44a647174d90b55fbe6855ebeac6f86248adb4db4ba951facb1 WHIRLPOOL 836ea86fe64851eb1c8891f70ee8502bb2ff76c919536a3f57f06880dfed96626a658f3a722622ac49deb6d55ca9235755b56c771ed55d298b993c009c283b48
33 -DIST elasticsearch-py-2.4.1.tar.gz 77420 SHA256 673cdc861d2fd0cd9d1de5be80239dab01340b19e549ff2cbd65058bdcd86d54 SHA512 39eceffee56a4b7ed242c8edfc9634f31041d630e9621b8418a298ea3b32c3dd50a19fda0901e03823ed8dc1dc2c528d9526329ade7755cbed4b1510cc3a50db WHIRLPOOL e6771c722d6670d51fc01c5687ebce6e0b036ddb3aaee2b64238d8ed1ea64a7cf58fb0685af715ba91bb9bc4256dbced7952b016ceb95bef09d2f4be3fa97f4a
34 -DIST elasticsearch-py-5.0.1.tar.gz 79648 SHA256 b4e17253b950f550c8fb53a68f431abc0a67131154aecd3a1dff19e955c3345c SHA512 a10483c853b3b1b6a9a250ceb51738b5351764cde18140b0b754f6563aa5ed8d3095063e85524968adc0faeb846acebedeeab7a29533e3025db698db228823d9 WHIRLPOOL 109890c3c6a408a700e9d03265308b3d33910a8883e2ec48657c0b2f0c0bb48349067ad19877d76f27945b5712e373db669bda7f74128e077198853f18397a5f
35 -DIST elasticsearch-py-5.1.0.tar.gz 79933 SHA256 6d2c06607dd1c27842e25552878c2d45a345dc27946e8819588bcacedbe3c5f8 SHA512 a8b34c767247c906e7b602161adb94614b17f293e350908b375ae9c1a4f835914b3f4081cab20f958976c8b355189f1b4d3afa88dc66277773cf944fa7bbaccb WHIRLPOOL 9c1b8635220f24e4954d3464facff32a8d71e8aaef05062a8bc9e9eca369b179a9b50309558f1a199abb97bbadfe80e5344038015a54477664a9c8ea1e5ca500
36 -DIST elasticsearch-py-5.2.0.tar.gz 80317 SHA256 47725bfb394d40198ef8cdf254f2ded87970c87282e1b09510de0406ebbf5476 SHA512 df03879c981361b55f0c12ad7bbc9a123b49d9a6b351aa18840858f4ac43b9ef11d8a9a8b3200e295e461438254bf95c4f233a50752f917aa31392be5cd3b7fc WHIRLPOOL 7ed9f9af2d4c4cc4011454f3e9bfa8121e375d017d2a23ef3420cb3b02c054a9976438eaa4cdd3cdeda39602d14941376ec2da65b839858229cfd9274893f6d8
37 -DIST elasticsearch-py-5.3.0.tar.gz 80767 SHA256 f0b8a33a81b12a5a1b2bb603093a63a39e9e1ca116e56f85d18c02c2e93d6173 SHA512 2479b5be237f4ba4ca87997fafa92041fba1fe49658117515d70ae5d551e4da11d4556b3ed23f7b7c8907606b6b1f76b024a0293fd58072cf9bf650a902e5f06 WHIRLPOOL 4b17838d11d33edb389fc864f7aba0e07f4c766bc5197d19e029c05a304b2e9ac1b42d76ce4948b51e093bfbd90b1d8366725d48f6546b783b32afed65afeb64
38 DIST elasticsearch-py-5.4.0.tar.gz 81286 SHA256 a574eea0032b73765efc6072f7e2b87a6a64cda08c23559ad46b7f3046d5a217 SHA512 9d30ffa810f495662769e6d2f2627f9ef6aa3849bc2eecd09df28c05a036b8fb15ae465914c38eeb3d854683bc150a3c56425388312bcd112bd5cc7b33ad41ae WHIRLPOOL 83e1076ace42ab73d6ca6502b7c0608b226649c82523b7779cbf76da90027cd36f9dde9ad022dba96f3c429b94e489ae0194d92549450838d21d8040985563b3
39 DIST elasticsearch-py-5.5.1.tar.gz 83543 SHA256 da5605ee82b61a815524df596a37d1fe926a0f5b571ab7197d9cb7097e8c43e4 SHA512 ac6dbbedaacc1bf3653edeab7c87885cc11682753ed8c51d82109cf24ba0b7ffb36b809eac7cfddd8c5bf37647c2d7c30a129f65748d5795459850e6fa0dd3dd WHIRLPOOL 80ecbe6064b4413b7e3a66760f418d73bf3a9671958feced8e052fc743f05fed01933a228ca284fd385dacf4c73f136bfe2d30556755690bd172d28950f6b24b
40 DIST elasticsearch-py-6.0.0.tar.gz 83197 SHA256 5409d1e7b12190e852f6e8c9190ab00b015ebc951a152a65fe6a5ebefc76cc14 SHA512 1d6c27654f9470837e9cb9866cb6f5305d63cac9dc6bddc06309e378a5e7b7fe3d21cae5ffd115685fe8ddcfd8cbbe1457d74799dde0fc7427f90fc870f1c444 WHIRLPOOL 011570a8f4b09fd324339fd92814e6b1b63961547826ebfc0b53759c1d8e0d6c230279b77547d0cca4e73dc42c9a1264493f47e069331c1652afd489567b40be
41
42 diff --git a/dev-python/elasticsearch-py/elasticsearch-py-2.3.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-2.3.0.ebuild
43 deleted file mode 100644
44 index 0bee6f546f2..00000000000
45 --- a/dev-python/elasticsearch-py/elasticsearch-py-2.3.0.ebuild
46 +++ /dev/null
47 @@ -1,89 +0,0 @@
48 -# Copyright 1999-2016 Gentoo Foundation
49 -# Distributed under the terms of the GNU General Public License v2
50 -
51 -EAPI=6
52 -
53 -PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
54 -
55 -ES_VERSION="2.2.1"
56 -
57 -inherit distutils-r1
58 -
59 -RESTRICT="test" # fails to start in chroot envs, unreliable
60 -
61 -MY_PN=${PN/-py/}
62 -
63 -DESCRIPTION="official Python low-level client for Elasticsearch"
64 -HOMEPAGE="http://elasticsearch-py.rtfd.org/"
65 -SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
66 - test? ( https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${ES_VERSION}/elasticsearch-${ES_VERSION}.tar.gz )"
67 -
68 -LICENSE="Apache-2.0"
69 -SLOT="0"
70 -KEYWORDS="amd64 x86"
71 -IUSE="examples doc test"
72 -
73 -RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
74 - <dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
75 -
76 -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
77 - >=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
78 - test? ( ${RDEPEND}
79 - >=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
80 - <dev-python/requests-3.0.0[${PYTHON_USEDEP}]
81 - dev-python/nose[${PYTHON_USEDEP}]
82 - dev-python/coverage[${PYTHON_USEDEP}]
83 - dev-python/mock[${PYTHON_USEDEP}]
84 - dev-python/pretty-yaml[${PYTHON_USEDEP}]
85 - dev-python/nosexcover[${PYTHON_USEDEP}]
86 - || ( virtual/jre:1.8 virtual/jre:1.7 ) )"
87 -
88 -python_test() {
89 - ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
90 - ES_PORT="25124"
91 - ES_LOG="${ES}/logs/elasticsearch.log"
92 - PID="${ES}/elasticsearch.pid"
93 -
94 - # run Elasticsearch instance on custom port
95 - sed -i "s/# http.port: 9200/http.port: ${ES_PORT}/g; \
96 - s/# cluster.name: my-application/cluster.name: gentoo-es-py-test/g" \
97 - ${ES}/config/elasticsearch.yml
98 -
99 - # start local instance of elasticsearch
100 - ${ES}/bin/elasticsearch -d -p ${PID}
101 -
102 - for i in `seq 10`; do
103 - grep -q "started" ${ES_LOG} 2> /dev/null
104 - if [ $? -eq 0 ]; then
105 - einfo "Elasticsearch started"
106 - eend 0
107 - break
108 - elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
109 - eend 1
110 - eerror "Elasticsearch already running"
111 - die "Cannot start Elasticsearch for tests"
112 - else
113 - einfo "Waiting for Elasticsearch"
114 - eend 1
115 - sleep 2
116 - continue
117 - fi
118 - done
119 -
120 - export TEST_ES_SERVER="localhost:${ES_PORT}"
121 - esetup.py test
122 -
123 - pkill -F ${PID}
124 -}
125 -
126 -python_compile_all() {
127 - cd docs || die
128 - emake man $(usex doc html "")
129 -}
130 -
131 -python_install_all() {
132 - use doc && HTML_DOCS=( docs/_build/html/. )
133 - use examples && dodoc -r example
134 - doman docs/_build/man/*
135 - distutils-r1_python_install_all
136 -}
137
138 diff --git a/dev-python/elasticsearch-py/elasticsearch-py-2.4.1.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-2.4.1.ebuild
139 deleted file mode 100644
140 index f5ddcabcdb2..00000000000
141 --- a/dev-python/elasticsearch-py/elasticsearch-py-2.4.1.ebuild
142 +++ /dev/null
143 @@ -1,93 +0,0 @@
144 -# Copyright 1999-2017 Gentoo Foundation
145 -# Distributed under the terms of the GNU General Public License v2
146 -
147 -EAPI=6
148 -
149 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
150 -
151 -ES_VERSION="2.4.4"
152 -
153 -inherit distutils-r1
154 -
155 -# tests fail in chroot
156 -# https://github.com/elastic/elasticsearch/issues/12018
157 -RESTRICT="test"
158 -
159 -MY_PN=${PN/-py/}
160 -
161 -DESCRIPTION="official Python low-level client for Elasticsearch"
162 -HOMEPAGE="http://elasticsearch-py.rtfd.org/"
163 -SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
164 - test? ( https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${ES_VERSION}/elasticsearch-${ES_VERSION}.tar.gz )"
165 -
166 -LICENSE="Apache-2.0"
167 -SLOT="0"
168 -KEYWORDS="amd64 x86"
169 -IUSE="examples doc test"
170 -
171 -RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
172 - <dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
173 -
174 -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
175 - >=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
176 - test? ( ${RDEPEND}
177 - >=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
178 - <dev-python/requests-3.0.0[${PYTHON_USEDEP}]
179 - dev-python/nose[${PYTHON_USEDEP}]
180 - dev-python/coverage[${PYTHON_USEDEP}]
181 - dev-python/mock[${PYTHON_USEDEP}]
182 - dev-python/pretty-yaml[${PYTHON_USEDEP}]
183 - dev-python/nosexcover[${PYTHON_USEDEP}]
184 - virtual/jre:1.8 )"
185 -
186 -python_test() {
187 - ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
188 - ES_PORT="25124"
189 - ES_INSTANCE="gentoo-es-py-test"
190 - ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
191 - PID="${ES}/elasticsearch.pid"
192 -
193 - # run Elasticsearch instance on custom port
194 - sed -i "s/# http.port: 9200/http.port: ${ES_PORT}/g; \
195 - s/# cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
196 - "${ES}/config/elasticsearch.yml" || die
197 -
198 - # start local instance of elasticsearch
199 - "${ES}/bin/elasticsearch" -d -p "${PID}" || die
200 -
201 - local i
202 - for i in {1..15}; do
203 - grep -q "started" "${ES_LOG}" 2> /dev/null
204 - if [[ $? -eq 0 ]]; then
205 - einfo "Elasticsearch started"
206 - eend 0
207 - break
208 - elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
209 - eend 1
210 - eerror "Elasticsearch already running"
211 - die "Cannot start Elasticsearch for tests"
212 - else
213 - einfo "Waiting for Elasticsearch"
214 - eend 1
215 - sleep 2
216 - continue
217 - fi
218 - done
219 -
220 - export TEST_ES_SERVER="localhost:${ES_PORT}"
221 - esetup.py test || die
222 -
223 - pkill -F ${PID}
224 -}
225 -
226 -python_compile_all() {
227 - cd docs || die
228 - emake man $(usex doc html "")
229 -}
230 -
231 -python_install_all() {
232 - use doc && HTML_DOCS=( docs/_build/html/. )
233 - use examples && dodoc -r example
234 - doman docs/_build/man/*
235 - distutils-r1_python_install_all
236 -}
237
238 diff --git a/dev-python/elasticsearch-py/elasticsearch-py-5.0.1.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-5.0.1.ebuild
239 deleted file mode 100644
240 index 53a18e947df..00000000000
241 --- a/dev-python/elasticsearch-py/elasticsearch-py-5.0.1.ebuild
242 +++ /dev/null
243 @@ -1,92 +0,0 @@
244 -# Copyright 1999-2016 Gentoo Foundation
245 -# Distributed under the terms of the GNU General Public License v2
246 -
247 -EAPI=6
248 -
249 -PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
250 -
251 -ES_VERSION="5.1.1"
252 -
253 -inherit distutils-r1
254 -
255 -# tests fail in chroot
256 -# https://github.com/elastic/elasticsearch/issues/12018
257 -RESTRICT="test"
258 -
259 -MY_PN=${PN/-py/}
260 -
261 -DESCRIPTION="official Python low-level client for Elasticsearch"
262 -HOMEPAGE="http://elasticsearch-py.rtfd.org/"
263 -SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
264 - test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
265 -
266 -LICENSE="Apache-2.0"
267 -SLOT="0"
268 -KEYWORDS="~amd64 ~x86"
269 -IUSE="examples doc test"
270 -
271 -RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
272 - <dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
273 -
274 -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
275 - >=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
276 - test? ( ${RDEPEND}
277 - >=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
278 - <dev-python/requests-3.0.0[${PYTHON_USEDEP}]
279 - dev-python/nose[${PYTHON_USEDEP}]
280 - dev-python/coverage[${PYTHON_USEDEP}]
281 - dev-python/mock[${PYTHON_USEDEP}]
282 - dev-python/pretty-yaml[${PYTHON_USEDEP}]
283 - dev-python/nosexcover[${PYTHON_USEDEP}]
284 - || ( virtual/jre:1.8 virtual/jre:1.7 ) )"
285 -
286 -python_test() {
287 - ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
288 - ES_PORT="25124"
289 - ES_LOG="${ES}/logs/elasticsearch.log"
290 - PID="${ES}/elasticsearch.pid"
291 -
292 - # run Elasticsearch instance on custom port
293 - sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
294 - s/#cluster.name: my-application/cluster.name: gentoo-es-py-test/g" \
295 - "${ES}/config/elasticsearch.yml" || die
296 -
297 - # start local instance of elasticsearch
298 - "${ES}"/bin/elasticsearch -d -p "${PID}" || die
299 -
300 - local i
301 - for i in {1..10}; do
302 - grep -q "started" ${ES_LOG} 2> /dev/null
303 - if [[ $? -eq 0 ]]; then
304 - einfo "Elasticsearch started"
305 - eend 0
306 - break
307 - elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
308 - eend 1
309 - eerror "Elasticsearch already running"
310 - die "Cannot start Elasticsearch for tests"
311 - else
312 - einfo "Waiting for Elasticsearch"
313 - eend 1
314 - sleep 2
315 - continue
316 - fi
317 - done
318 -
319 - export TEST_ES_SERVER="localhost:${ES_PORT}"
320 - esetup.py test || die
321 -
322 - pkill -F ${PID}
323 -}
324 -
325 -python_compile_all() {
326 - cd docs || die
327 - emake man $(usex doc html "")
328 -}
329 -
330 -python_install_all() {
331 - use doc && HTML_DOCS=( docs/_build/html/. )
332 - use examples && dodoc -r example
333 - doman docs/_build/man/*
334 - distutils-r1_python_install_all
335 -}
336
337 diff --git a/dev-python/elasticsearch-py/elasticsearch-py-5.1.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-5.1.0.ebuild
338 deleted file mode 100644
339 index afdb6da6dce..00000000000
340 --- a/dev-python/elasticsearch-py/elasticsearch-py-5.1.0.ebuild
341 +++ /dev/null
342 @@ -1,93 +0,0 @@
343 -# Copyright 1999-2017 Gentoo Foundation
344 -# Distributed under the terms of the GNU General Public License v2
345 -
346 -EAPI=6
347 -
348 -PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
349 -
350 -ES_VERSION="5.1.2"
351 -
352 -inherit distutils-r1
353 -
354 -# tests fail in chroot
355 -# https://github.com/elastic/elasticsearch/issues/12018
356 -RESTRICT="test"
357 -
358 -MY_PN=${PN/-py/}
359 -
360 -DESCRIPTION="official Python low-level client for Elasticsearch"
361 -HOMEPAGE="http://elasticsearch-py.rtfd.org/"
362 -SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
363 - test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
364 -
365 -LICENSE="Apache-2.0"
366 -SLOT="0"
367 -KEYWORDS="~amd64 ~x86"
368 -IUSE="examples doc test"
369 -
370 -RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
371 - <dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
372 -
373 -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
374 - >=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
375 - test? ( ${RDEPEND}
376 - >=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
377 - <dev-python/requests-3.0.0[${PYTHON_USEDEP}]
378 - dev-python/nose[${PYTHON_USEDEP}]
379 - dev-python/coverage[${PYTHON_USEDEP}]
380 - dev-python/mock[${PYTHON_USEDEP}]
381 - dev-python/pretty-yaml[${PYTHON_USEDEP}]
382 - dev-python/nosexcover[${PYTHON_USEDEP}]
383 - virtual/jre:1.8 )"
384 -
385 -python_test() {
386 - ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
387 - ES_PORT="25124"
388 - ES_INSTANCE="gentoo-es-py-test"
389 - ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
390 - PID="${ES}/elasticsearch.pid"
391 -
392 - # run Elasticsearch instance on custom port
393 - sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
394 - s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
395 - "${ES}/config/elasticsearch.yml" || die
396 -
397 - # start local instance of elasticsearch
398 - "${ES}"/bin/elasticsearch -d -p "${PID}" -Edefault.path.repo=/ || die
399 -
400 - local i
401 - for i in {1..15}; do
402 - grep -q "started" ${ES_LOG} 2> /dev/null
403 - if [[ $? -eq 0 ]]; then
404 - einfo "Elasticsearch started"
405 - eend 0
406 - break
407 - elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
408 - eend 1
409 - eerror "Elasticsearch already running"
410 - die "Cannot start Elasticsearch for tests"
411 - else
412 - einfo "Waiting for Elasticsearch"
413 - eend 1
414 - sleep 2
415 - continue
416 - fi
417 - done
418 -
419 - export TEST_ES_SERVER="localhost:${ES_PORT}"
420 - esetup.py test || die
421 -
422 - pkill -F ${PID}
423 -}
424 -
425 -python_compile_all() {
426 - cd docs || die
427 - emake man $(usex doc html "")
428 -}
429 -
430 -python_install_all() {
431 - use doc && HTML_DOCS=( docs/_build/html/. )
432 - use examples && dodoc -r example
433 - doman docs/_build/man/*
434 - distutils-r1_python_install_all
435 -}
436
437 diff --git a/dev-python/elasticsearch-py/elasticsearch-py-5.2.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-5.2.0.ebuild
438 deleted file mode 100644
439 index 3d0a9b8b655..00000000000
440 --- a/dev-python/elasticsearch-py/elasticsearch-py-5.2.0.ebuild
441 +++ /dev/null
442 @@ -1,98 +0,0 @@
443 -# Copyright 1999-2017 Gentoo Foundation
444 -# Distributed under the terms of the GNU General Public License v2
445 -
446 -EAPI=6
447 -
448 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
449 -
450 -ES_VERSION="5.2.1"
451 -
452 -inherit distutils-r1
453 -
454 -# tests fail in chroot
455 -# https://github.com/elastic/elasticsearch/issues/12018
456 -RESTRICT="test"
457 -
458 -MY_PN=${PN/-py/}
459 -
460 -DESCRIPTION="official Python low-level client for Elasticsearch"
461 -HOMEPAGE="http://elasticsearch-py.rtfd.org/"
462 -SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
463 - test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
464 -
465 -LICENSE="Apache-2.0"
466 -SLOT="0"
467 -KEYWORDS="~amd64 x86"
468 -IUSE="examples doc test"
469 -
470 -RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
471 - <dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
472 -
473 -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
474 - >=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
475 - test? ( ${RDEPEND}
476 - >=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
477 - <dev-python/requests-3.0.0[${PYTHON_USEDEP}]
478 - dev-python/nose[${PYTHON_USEDEP}]
479 - dev-python/coverage[${PYTHON_USEDEP}]
480 - dev-python/mock[${PYTHON_USEDEP}]
481 - dev-python/pretty-yaml[${PYTHON_USEDEP}]
482 - dev-python/nosexcover[${PYTHON_USEDEP}]
483 - virtual/jre:1.8 )"
484 -
485 -# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
486 -python_test() {
487 - ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
488 - ES_PORT="25124"
489 - ES_INSTANCE="gentoo-es-py-test"
490 - ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
491 - PID="${ES}/elasticsearch.pid"
492 -
493 - # run Elasticsearch instance on custom port
494 - sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
495 - s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
496 - "${ES}/config/elasticsearch.yml" || die
497 -
498 - # start local instance of elasticsearch
499 - "${ES}"/bin/elasticsearch -d -p "${PID}" -Edefault.path.repo=/ || die
500 -
501 - local i
502 - local es_started=0
503 - for i in {1..15}; do
504 - grep -q "started" ${ES_LOG} 2> /dev/null
505 - if [[ $? -eq 0 ]]; then
506 - einfo "Elasticsearch started"
507 - es_started=1
508 - eend 0
509 - break
510 - elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
511 - eend 1
512 - eerror "Elasticsearch already running"
513 - die "Cannot start Elasticsearch for tests"
514 - else
515 - einfo "Waiting for Elasticsearch"
516 - eend 1
517 - sleep 2
518 - continue
519 - fi
520 - done
521 -
522 - [[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
523 -
524 - export TEST_ES_SERVER="localhost:${ES_PORT}"
525 - esetup.py test || die
526 -
527 - pkill -F ${PID}
528 -}
529 -
530 -python_compile_all() {
531 - cd docs || die
532 - emake man $(usex doc html "")
533 -}
534 -
535 -python_install_all() {
536 - use doc && HTML_DOCS=( docs/_build/html/. )
537 - use examples && dodoc -r example
538 - doman docs/_build/man/*
539 - distutils-r1_python_install_all
540 -}
541
542 diff --git a/dev-python/elasticsearch-py/elasticsearch-py-5.3.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-5.3.0.ebuild
543 deleted file mode 100644
544 index a25ac2a625d..00000000000
545 --- a/dev-python/elasticsearch-py/elasticsearch-py-5.3.0.ebuild
546 +++ /dev/null
547 @@ -1,98 +0,0 @@
548 -# Copyright 1999-2017 Gentoo Foundation
549 -# Distributed under the terms of the GNU General Public License v2
550 -
551 -EAPI=6
552 -
553 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
554 -
555 -ES_VERSION="5.3.2"
556 -
557 -inherit distutils-r1
558 -
559 -# tests fail in chroot
560 -# https://github.com/elastic/elasticsearch/issues/12018
561 -RESTRICT="test"
562 -
563 -MY_PN=${PN/-py/}
564 -
565 -DESCRIPTION="official Python low-level client for Elasticsearch"
566 -HOMEPAGE="http://elasticsearch-py.rtfd.org/"
567 -SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
568 - test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
569 -
570 -LICENSE="Apache-2.0"
571 -SLOT="0"
572 -KEYWORDS="~amd64 ~x86"
573 -IUSE="examples doc test"
574 -
575 -RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
576 - <dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
577 -
578 -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
579 - >=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
580 - test? ( ${RDEPEND}
581 - >=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
582 - <dev-python/requests-3.0.0[${PYTHON_USEDEP}]
583 - dev-python/nose[${PYTHON_USEDEP}]
584 - dev-python/coverage[${PYTHON_USEDEP}]
585 - dev-python/mock[${PYTHON_USEDEP}]
586 - dev-python/pretty-yaml[${PYTHON_USEDEP}]
587 - dev-python/nosexcover[${PYTHON_USEDEP}]
588 - virtual/jre:1.8 )"
589 -
590 -# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
591 -python_test() {
592 - ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
593 - ES_PORT="25124"
594 - ES_INSTANCE="gentoo-es-py-test"
595 - ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
596 - PID="${ES}/elasticsearch.pid"
597 -
598 - # run Elasticsearch instance on custom port
599 - sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
600 - s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
601 - "${ES}/config/elasticsearch.yml" || die
602 -
603 - # start local instance of elasticsearch
604 - "${ES}"/bin/elasticsearch -d -p "${PID}" -Edefault.path.repo=/ || die
605 -
606 - local i
607 - local es_started=0
608 - for i in {1..15}; do
609 - grep -q "started" ${ES_LOG} 2> /dev/null
610 - if [[ $? -eq 0 ]]; then
611 - einfo "Elasticsearch started"
612 - es_started=1
613 - eend 0
614 - break
615 - elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
616 - eend 1
617 - eerror "Elasticsearch already running"
618 - die "Cannot start Elasticsearch for tests"
619 - else
620 - einfo "Waiting for Elasticsearch"
621 - eend 1
622 - sleep 2
623 - continue
624 - fi
625 - done
626 -
627 - [[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
628 -
629 - export TEST_ES_SERVER="localhost:${ES_PORT}"
630 - esetup.py test || die
631 -
632 - pkill -F ${PID}
633 -}
634 -
635 -python_compile_all() {
636 - cd docs || die
637 - emake man $(usex doc html "")
638 -}
639 -
640 -python_install_all() {
641 - use doc && HTML_DOCS=( docs/_build/html/. )
642 - use examples && dodoc -r example
643 - doman docs/_build/man/*
644 - distutils-r1_python_install_all
645 -}