Skip to content

Commit

Permalink
Merge remote-tracking branch 'github/pr/643'.
Browse files Browse the repository at this point in the history
  • Loading branch information
monsieurp committed Jan 13, 2016
2 parents 3f1a8cc + 3fd5c5d commit dff0955
Show file tree
Hide file tree
Showing 2 changed files with 88 additions and 0 deletions.
2 changes: 2 additions & 0 deletions dev-python/elasticsearch-py/Manifest
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
DIST elasticsearch-1.7.3.tar.gz 28510917 SHA256 af517611493374cfb2daa8897ae17e63e2efea4d0377d316baa351c1776a2bca SHA512 0cb6b2ebd77c3d1467f6a22f845bfbf9f4a7c9c9ddedae17aeb6bd2d2bc576171fc80e3a4963e7b890af574e9fd0b0faa152e7f2671a74254826e14fe2554c9f WHIRLPOOL c86de3076389a9b95cf4d424673edb3c3b1dae0b4470b18b15a5f2e9bde6669a61b8ffd5cc3f7fc3b52f99441915a84b0396a5673ebbc12fec0d83eb41a03c74
DIST elasticsearch-2.0.0.tar.gz 28576708 SHA256 b25f13f615337c2072964fd9fc5c7250f8a2a983b22198daf93548285d5d16df SHA512 23473b658d68c07b65f66e04cdac07c0b88ac3a2a9ca1d5e700b5b17ebc1b23b77a5b0fa32959d30d8e0267ec186be42de0c11ce86864fe55d0e353c27d0003a WHIRLPOOL 22a7a274961999d5105ed9ba817d225deb8e46330e5774be8caecb34e6997c2a8debf348a5f6d58ac9d959a6b96957723a63944750155f37592278b8e6e590c6
DIST elasticsearch-2.1.1.tar.gz 29007342 SHA256 ebd69c0483f20ba7e51caa9606d4e3ce5fe2667e1216c799f0cdbb815c317ce6 SHA512 eff12cd7342dc0036dc88f03ced9c7cc90d284222efeca86adfd9e4cf254cb8f96105c58673b239cfc9eb9764a2a669d2cd171ca73eb43b1ec1470a13c5e1776 WHIRLPOOL 2b0e069d162ee07eddc90d879d4ce5dd2cef9e4a804a9aaeb3d99e5d532f583589e2c6a36b5e856bf19a610f220eea6aaa75d28e7b6687b60eab7bf83b2def51
DIST elasticsearch-py-1.4.0.tar.gz 74498 SHA256 7959787b47c3523e9c9aeffec441091fcd2b293d26c4fd5f576cf84cfb85ef63 SHA512 dbe51362f68d40e95a0cfefde4feb8d9d9c61b4f4795cbf69fd70bf981f290812ebac19a20ae8594cc39ac46a3c35ddfe450ff436fca0fada060736128478cf7 WHIRLPOOL a6730bcccc1201048f82aed6e63b7e73f38150002dd9889c575c9edf52834bc6f9a8256977ac27b092f3865074e4699729cc766564a4b731766d77d6a6de6324
DIST elasticsearch-py-1.5.0.tar.gz 77037 SHA256 275eaeb2f64c8eba8691d953ac0d8a16e4f759d9cad797323b7cbd0ef87a69ce SHA512 10d473a221be3deb086dca0c5463324647e38f8be4f4bbea934079b002f1414d30c98976c56fd2fc55c97d24ed2338137a9983194e8bf82c95cc70321ee5ee86 WHIRLPOOL 3aa83b9bfd5363ea39baf58cc7bdaaa9606085e471e7e683518cf707642fc9a514264c51cf3e296db071a2a5333f58b8e1335bc4473477df9d085bea63c584ba
DIST elasticsearch-py-1.6.0.tar.gz 77205 SHA256 59dd03284ab7314e5eb50d13ba92df65efb93778ca318906baad5776b152aff7 SHA512 09cdec0b3f50707b9a5e11534fe28507db669e4da44bbda1952d07b6ac8e3aea0c0c05297db26d9425c2247724681fa4e5485e9525571ff64f070e700a9a9b07 WHIRLPOOL 04f43a848cc811d1bee22d2bf7931a4348fb4a455172e381bedad5179d72313320009cb8b2dfdadb252aacc13cc1a4ef15b311488401d6b2bc23e242272bb74b
DIST elasticsearch-py-1.8.0.tar.gz 73848 SHA256 9394a1eef66223f8292f005bbe0c2309df10f76e8065823966e045e5e0a76cb3 SHA512 c4ca91db0fd1094dd02b1a9e7ca94f11c4c528373a71f180c5e256efdf53515802fc854866dcb7077e2f5c6300ee88cb80fd6c766e22f1f76357a0b970e1444d WHIRLPOOL b3cfd3011e97cfe97690a784e896dc794ece747ed1b82e1a3b1731b9dda25f38011ef4e0dd8271a514f31a85fb35349877baa2ce66908f908c5c7470412a23ef
DIST elasticsearch-py-1.9.0.tar.gz 74021 SHA256 bf00a6c7ecd965bf585199335d2619267ae0caabc356ee011dfc37e373edc023 SHA512 1a523867fd40534332a8b46e84ca3009dbaf86c9bf51e1487d76b90420e0c5371271f7956ebd2a416288bab57fa539377471386e23bcc03b1e7cdd4ab90a6027 WHIRLPOOL 9c5f4ffcdc97ce695845d8597d39aa41e71495de78f49fa2003d3665f683a04e32d5a5dabd4670ab9928a1ebc082564b4169b7e19f5c803146772b50598ae091
DIST elasticsearch-py-2.1.0.tar.gz 72785 SHA256 faa04d251ba266c419bb45b644b984fc3028f558ff50d34ec92547f65db75652 SHA512 445ca902b9b1b0239f751174d812672a623a205bc22da679a61edcd88a29d86be2e1e35421579da1ae34b346476f951c24848015bbf2d437e2209b706044ec0b WHIRLPOOL e50ec6278a229f5129aa56693b761226ba11a453f1841dadec54a57998205246b8a95eb10365a79fb831ed47532d8b3c231f4134515e4f169b123e4d7bfcf8e4
DIST elasticsearch-py-2.2.0.tar.gz 74228 SHA256 e0d252a8c1e9af2b7b89ae8aa8cb006bb1714e19e147418655baebd0c4f90e77 SHA512 fcdcb72064920aeaaaba644166184d6826d5bd26542824744cb9bc899d01b50f972bbee4e92dce2f24fc81d66201d807d89fb2b9ccda446986eb79c9c131171e WHIRLPOOL a92cbe1e959cef132901c60c31ec0cc30a437e049205b4475094a05112efdb58fb136c92e3e1507589e1c77d001679d1e083710accb9ee47c43d25d0a71c183c
86 changes: 86 additions & 0 deletions dev-python/elasticsearch-py/elasticsearch-py-2.2.0.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$

EAPI=6

PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )

ES_VERSION="2.1.1"

inherit distutils-r1

DESCRIPTION="official Python low-level client for Elasticsearch"
HOMEPAGE="http://elasticsearch-py.rtfd.org/"
SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
test? ( https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${ES_VERSION}/elasticsearch-${ES_VERSION}.tar.gz )"

LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~mips ~x86"
IUSE="examples doc test"

RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
<dev-python/urllib3-2.0[${PYTHON_USEDEP}]"

DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
test? ( ${RDEPEND}
>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
dev-python/coverage[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
dev-python/pretty-yaml[${PYTHON_USEDEP}]
dev-python/nosexcover[${PYTHON_USEDEP}]
|| ( virtual/jre:1.8 virtual/jre:1.7 ) )"

python_test() {
ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
ES_PORT="25124"
ES_LOG="${ES}/logs/elasticsearch.log"
PID="${ES}/elasticsearch.pid"

# run Elasticsearch instance on custom port
sed -i "s/# http.port: 9200/http.port: ${ES_PORT}/g; \
s/# cluster.name: my-application/cluster.name: gentoo-es-py-test/g" \
${ES}/config/elasticsearch.yml

# start local instance of elasticsearch
${ES}/bin/elasticsearch -d -p ${PID}

for i in `seq 10`; do
grep -q "started" ${ES_LOG} 2> /dev/null
if [ $? -eq 0 ]; then
einfo "Elasticsearch started"
eend 0
break
elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
eend 1
eerror "Elasticsearch already running"
die "Cannot start Elasticsearch for tests"
else
einfo "Waiting for Elasticsearch"
eend 1
sleep 2
continue
fi
done

export TEST_ES_SERVER="localhost:${ES_PORT}"
esetup.py test

pkill -F ${PID}
}

python_compile_all() {
cd docs || die
emake man $(usex doc html "")
}

python_install_all() {
use doc && HTML_DOCS=( docs/_build/html/. )
use examples && local EXAMPLES=( example/. )
doman docs/_build/man/*
distutils-r1_python_install_all
}

0 comments on commit dff0955

Please sign in to comment.