| 1 |
commit: 00f0cdcab448de97de5e2f176e5d80a84d29deae |
| 2 |
Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Dec 18 06:24:43 2016 +0000 |
| 4 |
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 27 17:31:50 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00f0cdca |
| 7 |
|
| 8 |
dev-python/elasticsearch-py: improve ebuild |
| 9 |
|
| 10 |
dev-python/elasticsearch-py/Manifest | 1 + |
| 11 |
.../elasticsearch-py/elasticsearch-py-5.0.1.ebuild | 22 ++++++++++++---------- |
| 12 |
2 files changed, 13 insertions(+), 10 deletions(-) |
| 13 |
|
| 14 |
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest |
| 15 |
index cda7a1d..7cdf3e6 100644 |
| 16 |
--- a/dev-python/elasticsearch-py/Manifest |
| 17 |
+++ b/dev-python/elasticsearch-py/Manifest |
| 18 |
@@ -1,6 +1,7 @@ |
| 19 |
DIST elasticsearch-2.2.1.tar.gz 29424648 SHA256 7d43d18a8ee8d715d827ed26b4ff3d939628f5a5b654c6e8de9d99bf3a9b2e03 SHA512 9254175afff5c002625465fb5f398e4e53d121925a656af13e65d90eb3b3ef7507ef094cf44002f104a84e5147a8677a05f4071248140d6b48179b9057867cb5 WHIRLPOOL a470a663b8ec1b8cb7a8daf6bfc02ed7d5d0f23caab063ac2e6c7456bda449bad3e81237699fa434f077d4f86ee09dac7d007b554acc6428f2b436cf8448b210 |
| 20 |
DIST elasticsearch-2.3.5.tar.gz 27547995 SHA256 1119a8c18620b98c4b85261318663a1f26dea92a26f34dfeb7f813fb7cbb468a SHA512 9c0cc8a9ae0fa2b52db583a5c006b05a84c1f84e1b8dbbafa88bec111190d056a23bd384d4241ce00dc8b56a6840857b296e4c0d2bf911f352ef67f128a87ca7 WHIRLPOOL de2aee3773d14c9b4abc0f20c3c8df1fe374a91ea54493f2c1df59fb8c02c97d684fd94b6bfaf140eebcfea4913197b10469b5aef34f62db89d825ae508a5095 |
| 21 |
DIST elasticsearch-5.0.0.tar.gz 32968292 SHA256 a866534f0fa7428e980c985d712024feef1dee04709add6e360fc7b73bb1e7ae SHA512 a4fa650d643c242a1f90059cfe6eb27e3d240b3deafc426abeae72c13aeae84b01ffb8b872b748619dfc58225ca29bde054fe10e1529522f9a06a1051991e4cd WHIRLPOOL a05a6dc785c00bb461ea286490cacc0222f9f95f0dea7ba61c6308cee0284edc53ee0a2047f723e990fa99f7ed09feda46313997b8f6dd487b042a6b26ecf8d6 |
| 22 |
+DIST elasticsearch-5.1.1.tar.gz 33291322 SHA256 cd45bafb1f74a7df9bad12c77b7bf3080069266bcbe0b256b0959ef2536e31e8 SHA512 2b5faf97c5ff41a9f12e21749d60f3632b39987d4886713ee9646110acdd17323d263168980d7dd4035732556b604acd68dc37ae7b805d84493075776b9d7bcd WHIRLPOOL ebb46d4a5643f09c0c903055c407a54d46264347924ca37cc73adfee3dd8a9bf2157b1be92b9b1d85636ea92b2d1f89d558c5413c804412996ea9bce42f1c3c6 |
| 23 |
DIST elasticsearch-py-1.4.0.tar.gz 74498 SHA256 7959787b47c3523e9c9aeffec441091fcd2b293d26c4fd5f576cf84cfb85ef63 SHA512 dbe51362f68d40e95a0cfefde4feb8d9d9c61b4f4795cbf69fd70bf981f290812ebac19a20ae8594cc39ac46a3c35ddfe450ff436fca0fada060736128478cf7 WHIRLPOOL a6730bcccc1201048f82aed6e63b7e73f38150002dd9889c575c9edf52834bc6f9a8256977ac27b092f3865074e4699729cc766564a4b731766d77d6a6de6324 |
| 24 |
DIST elasticsearch-py-2.3.0.tar.gz 74954 SHA256 3610d3a2d2f4eb1906794276ac6fca1ad801067e0f36d71a8a11c2c9112ed120 SHA512 53ffc265dc2c42ef983bf12a6d6bfcb96a378da97c58b52ff872968e50f01936815f2d28d667d44a647174d90b55fbe6855ebeac6f86248adb4db4ba951facb1 WHIRLPOOL 836ea86fe64851eb1c8891f70ee8502bb2ff76c919536a3f57f06880dfed96626a658f3a722622ac49deb6d55ca9235755b56c771ed55d298b993c009c283b48 |
| 25 |
DIST elasticsearch-py-2.4.0.tar.gz 77199 SHA256 0cab15c1a5c014f259703d982b074b3c6864fb152dd909fba60d23cde9133b76 SHA512 5a38419b4448850722c6af9181d5f00bed20796b645a336706040244c559893da7f57aa556251b8b2ee022c48f651b5f7646fc51f9f0f20ed3ab1449f244c096 WHIRLPOOL c28412a06b0a13329d8b4ad377cdfe3d88ac2afc130b872fcf51dadc148a6f17c4e3ea6b03982be8553d64c224841932aa8e1847fb225a001331219651c0d6dd |
| 26 |
|
| 27 |
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-5.0.1.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-5.0.1.ebuild |
| 28 |
index 67e3491..c94ffd6 100644 |
| 29 |
--- a/dev-python/elasticsearch-py/elasticsearch-py-5.0.1.ebuild |
| 30 |
+++ b/dev-python/elasticsearch-py/elasticsearch-py-5.0.1.ebuild |
| 31 |
@@ -6,18 +6,20 @@ EAPI=6 |
| 32 |
|
| 33 |
PYTHON_COMPAT=( python2_7 python3_{4,5} pypy ) |
| 34 |
|
| 35 |
-ES_VERSION="5.0.0" |
| 36 |
+ES_VERSION="5.1.1" |
| 37 |
|
| 38 |
inherit distutils-r1 |
| 39 |
|
| 40 |
-RESTRICT="test" # fails to start in chroot envs, unreliable |
| 41 |
+# tests fail in chroot |
| 42 |
+# https://github.com/elastic/elasticsearch/issues/12018 |
| 43 |
+RESTRICT="test" |
| 44 |
|
| 45 |
MY_PN=${PN/-py/} |
| 46 |
|
| 47 |
DESCRIPTION="official Python low-level client for Elasticsearch" |
| 48 |
HOMEPAGE="http://elasticsearch-py.rtfd.org/" |
| 49 |
SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz |
| 50 |
- test? ( https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${ES_VERSION}/elasticsearch-${ES_VERSION}.tar.gz )" |
| 51 |
+ test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )" |
| 52 |
|
| 53 |
LICENSE="Apache-2.0" |
| 54 |
SLOT="0" |
| 55 |
@@ -46,17 +48,17 @@ python_test() { |
| 56 |
PID="${ES}/elasticsearch.pid" |
| 57 |
|
| 58 |
# run Elasticsearch instance on custom port |
| 59 |
- sed -i "s/# http.port: 9200/http.port: ${ES_PORT}/g; \ |
| 60 |
- s/# cluster.name: my-application/cluster.name: gentoo-es-py-test/g" \ |
| 61 |
- ${ES}/config/elasticsearch.yml || die |
| 62 |
+ sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \ |
| 63 |
+ s/#cluster.name: my-application/cluster.name: gentoo-es-py-test/g" \ |
| 64 |
+ "${ES}/config/elasticsearch.yml" || die |
| 65 |
|
| 66 |
# start local instance of elasticsearch |
| 67 |
- ${ES}/bin/elasticsearch -d -p ${PID} || die |
| 68 |
+ "${ES}"/bin/elasticsearch -d -p "${PID}" || die |
| 69 |
|
| 70 |
local i |
| 71 |
- for i in `seq 10`; do |
| 72 |
+ for i in {1..10}; do |
| 73 |
grep -q "started" ${ES_LOG} 2> /dev/null |
| 74 |
- if [ $? -eq 0 ]; then |
| 75 |
+ if [[ $? -eq 0 ]]; then |
| 76 |
einfo "Elasticsearch started" |
| 77 |
eend 0 |
| 78 |
break |
| 79 |
@@ -73,7 +75,7 @@ python_test() { |
| 80 |
done |
| 81 |
|
| 82 |
export TEST_ES_SERVER="localhost:${ES_PORT}" |
| 83 |
- esetup.py test |
| 84 |
+ esetup.py test || die |
| 85 |
|
| 86 |
pkill -F ${PID} |
| 87 |
} |
Archives