| 1 |
commit: 0bcf37707029b33bf012a8c6b5e49014b3c42f62 |
| 2 |
Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Nov 17 20:15:34 2017 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 30 14:46:19 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bcf3770 |
| 7 |
|
| 8 |
dev-python/elasticsearch-py: bump to 5.5.1/6.0.0. |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/6219 |
| 11 |
|
| 12 |
dev-python/elasticsearch-py/Manifest | 4 + |
| 13 |
.../elasticsearch-py/elasticsearch-py-5.5.1.ebuild | 98 ++++++++++++++++++++++ |
| 14 |
.../elasticsearch-py/elasticsearch-py-6.0.0.ebuild | 98 ++++++++++++++++++++++ |
| 15 |
3 files changed, 200 insertions(+) |
| 16 |
|
| 17 |
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest |
| 18 |
index 7029fda89fe..0052b7917f7 100644 |
| 19 |
--- a/dev-python/elasticsearch-py/Manifest |
| 20 |
+++ b/dev-python/elasticsearch-py/Manifest |
| 21 |
@@ -4,6 +4,8 @@ DIST elasticsearch-5.1.1.tar.gz 33291322 SHA256 cd45bafb1f74a7df9bad12c77b7bf308 |
| 22 |
DIST elasticsearch-5.1.2.tar.gz 33299777 SHA256 74d752f9a8b46898d306ad169b72f328e17215c0909149e156a576089ef11c42 SHA512 1867626e8a87f11ed109e1325fd1d16c9e0af06ebe6a30c78ea679ab533ab377f5da8ea55af6871be33af226f02187a2aadd77e5e23c097dd24055be21e9d691 WHIRLPOOL 2e9df71c915343e2cc8ad82c59b877f41f5e093cbeba21f471c32cb51a195eccc6223bc48da48bb4af2e6bea9f2539f2e93b866963148f4ca2940ba4466e614e |
| 23 |
DIST elasticsearch-5.2.1.tar.gz 33516684 SHA256 f28bfecbb8896bbcf8c6063a474a2ddee29a262c216f56ff6d524fc898094475 SHA512 aa8734c1e1111987d45e8dd64b5f8a0473955c48e09e6f1875e877090c21070fc18768b413e7b0c20652cec9ebd9bb6836a2c014cf8159b041f0d22b28ad5a08 WHIRLPOOL 3cf8672facaf03149c4c6119d869d12c2f96fa3c4ce413bfd9b0c940cd90a54c1d87ca915cdb5d9bc9a86135d6efe7891fe6932538020488ef6b3bbc3fd37115 |
| 24 |
DIST elasticsearch-5.3.2.tar.gz 33704368 SHA256 a94fe46bc90eb271a0d448d20e49cb02526ac032281c683c79a219240280a1e8 SHA512 430021202fd747ea376e36e9035f05eaa27f06c25f2f8616e218a248f0aeaaffd8577d689c790b618e3fdbcbae23b7bd664d4380d0e323483f6e158675a4bc00 WHIRLPOOL 0fee048029880dabe901c0f9842ac331ef78204a70d0c71993cddbb8e76b7614af0e4b8e8181b36b9039b64093c9fd0720f5c8a2e7c515fc6634ac465c5f283a |
| 25 |
+DIST elasticsearch-5.6.4.tar.gz 33776770 SHA256 1098fc776fae8c74e65f8e17cf2ea244c1d07c4e6711340c9bb9f6df56aa45b0 SHA512 37730f39cf1711b6a20861370ef7aff4b48e7f90ad82cb1c8c92643179194c4dcdf0180691d8065304bf61e7f5a2fb1ed5c84c384e0b2ff7ad0dc58ac7352f47 WHIRLPOOL 37f1a615a7916738bb8f4809213edced96aaecf3d93df8cad0bc175c71191a6f1d3d616fc40b71e647b65e4c2e03f4f6ab9a4ff333b55d3728ca100b2181edbc |
| 26 |
+DIST elasticsearch-6.0.0.tar.gz 28017602 SHA256 0420e877a8b986485244f603770737e9e4e47186fdfa1093768a11e391e3d9f4 SHA512 25bb622d2fc557d8b8eded634a9b333766f7b58e701359e1bcfafee390776eb323cb7ea7a5e02e8803e25d8b1d3aabec0ec1b0cf492d0bab5689686fe440181c WHIRLPOOL 903e2069b6274a47102aa9b3945db545c2b1bf0417747500529439dd70dd98decc953902fd25fb9da8e39d035249927028567caa022942ae2d2295d7dbe33ee3 |
| 27 |
DIST elasticsearch-py-2.3.0.tar.gz 74954 SHA256 3610d3a2d2f4eb1906794276ac6fca1ad801067e0f36d71a8a11c2c9112ed120 SHA512 53ffc265dc2c42ef983bf12a6d6bfcb96a378da97c58b52ff872968e50f01936815f2d28d667d44a647174d90b55fbe6855ebeac6f86248adb4db4ba951facb1 WHIRLPOOL 836ea86fe64851eb1c8891f70ee8502bb2ff76c919536a3f57f06880dfed96626a658f3a722622ac49deb6d55ca9235755b56c771ed55d298b993c009c283b48 |
| 28 |
DIST elasticsearch-py-2.4.1.tar.gz 77420 SHA256 673cdc861d2fd0cd9d1de5be80239dab01340b19e549ff2cbd65058bdcd86d54 SHA512 39eceffee56a4b7ed242c8edfc9634f31041d630e9621b8418a298ea3b32c3dd50a19fda0901e03823ed8dc1dc2c528d9526329ade7755cbed4b1510cc3a50db WHIRLPOOL e6771c722d6670d51fc01c5687ebce6e0b036ddb3aaee2b64238d8ed1ea64a7cf58fb0685af715ba91bb9bc4256dbced7952b016ceb95bef09d2f4be3fa97f4a |
| 29 |
DIST elasticsearch-py-5.0.1.tar.gz 79648 SHA256 b4e17253b950f550c8fb53a68f431abc0a67131154aecd3a1dff19e955c3345c SHA512 a10483c853b3b1b6a9a250ceb51738b5351764cde18140b0b754f6563aa5ed8d3095063e85524968adc0faeb846acebedeeab7a29533e3025db698db228823d9 WHIRLPOOL 109890c3c6a408a700e9d03265308b3d33910a8883e2ec48657c0b2f0c0bb48349067ad19877d76f27945b5712e373db669bda7f74128e077198853f18397a5f |
| 30 |
@@ -11,3 +13,5 @@ DIST elasticsearch-py-5.1.0.tar.gz 79933 SHA256 6d2c06607dd1c27842e25552878c2d45 |
| 31 |
DIST elasticsearch-py-5.2.0.tar.gz 80317 SHA256 47725bfb394d40198ef8cdf254f2ded87970c87282e1b09510de0406ebbf5476 SHA512 df03879c981361b55f0c12ad7bbc9a123b49d9a6b351aa18840858f4ac43b9ef11d8a9a8b3200e295e461438254bf95c4f233a50752f917aa31392be5cd3b7fc WHIRLPOOL 7ed9f9af2d4c4cc4011454f3e9bfa8121e375d017d2a23ef3420cb3b02c054a9976438eaa4cdd3cdeda39602d14941376ec2da65b839858229cfd9274893f6d8 |
| 32 |
DIST elasticsearch-py-5.3.0.tar.gz 80767 SHA256 f0b8a33a81b12a5a1b2bb603093a63a39e9e1ca116e56f85d18c02c2e93d6173 SHA512 2479b5be237f4ba4ca87997fafa92041fba1fe49658117515d70ae5d551e4da11d4556b3ed23f7b7c8907606b6b1f76b024a0293fd58072cf9bf650a902e5f06 WHIRLPOOL 4b17838d11d33edb389fc864f7aba0e07f4c766bc5197d19e029c05a304b2e9ac1b42d76ce4948b51e093bfbd90b1d8366725d48f6546b783b32afed65afeb64 |
| 33 |
DIST elasticsearch-py-5.4.0.tar.gz 81286 SHA256 a574eea0032b73765efc6072f7e2b87a6a64cda08c23559ad46b7f3046d5a217 SHA512 9d30ffa810f495662769e6d2f2627f9ef6aa3849bc2eecd09df28c05a036b8fb15ae465914c38eeb3d854683bc150a3c56425388312bcd112bd5cc7b33ad41ae WHIRLPOOL 83e1076ace42ab73d6ca6502b7c0608b226649c82523b7779cbf76da90027cd36f9dde9ad022dba96f3c429b94e489ae0194d92549450838d21d8040985563b3 |
| 34 |
+DIST elasticsearch-py-5.5.1.tar.gz 83543 SHA256 da5605ee82b61a815524df596a37d1fe926a0f5b571ab7197d9cb7097e8c43e4 SHA512 ac6dbbedaacc1bf3653edeab7c87885cc11682753ed8c51d82109cf24ba0b7ffb36b809eac7cfddd8c5bf37647c2d7c30a129f65748d5795459850e6fa0dd3dd WHIRLPOOL 80ecbe6064b4413b7e3a66760f418d73bf3a9671958feced8e052fc743f05fed01933a228ca284fd385dacf4c73f136bfe2d30556755690bd172d28950f6b24b |
| 35 |
+DIST elasticsearch-py-6.0.0.tar.gz 83197 SHA256 5409d1e7b12190e852f6e8c9190ab00b015ebc951a152a65fe6a5ebefc76cc14 SHA512 1d6c27654f9470837e9cb9866cb6f5305d63cac9dc6bddc06309e378a5e7b7fe3d21cae5ffd115685fe8ddcfd8cbbe1457d74799dde0fc7427f90fc870f1c444 WHIRLPOOL 011570a8f4b09fd324339fd92814e6b1b63961547826ebfc0b53759c1d8e0d6c230279b77547d0cca4e73dc42c9a1264493f47e069331c1652afd489567b40be |
| 36 |
|
| 37 |
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-5.5.1.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-5.5.1.ebuild |
| 38 |
new file mode 100644 |
| 39 |
index 00000000000..a956d12f839 |
| 40 |
--- /dev/null |
| 41 |
+++ b/dev-python/elasticsearch-py/elasticsearch-py-5.5.1.ebuild |
| 42 |
@@ -0,0 +1,98 @@ |
| 43 |
+# Copyright 1999-2017 Gentoo Foundation |
| 44 |
+# Distributed under the terms of the GNU General Public License v2 |
| 45 |
+ |
| 46 |
+EAPI=6 |
| 47 |
+ |
| 48 |
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) |
| 49 |
+ |
| 50 |
+ES_VERSION="5.6.4" |
| 51 |
+ |
| 52 |
+inherit distutils-r1 |
| 53 |
+ |
| 54 |
+# tests fail in chroot |
| 55 |
+# https://github.com/elastic/elasticsearch/issues/12018 |
| 56 |
+RESTRICT="test" |
| 57 |
+ |
| 58 |
+MY_PN=${PN/-py/} |
| 59 |
+ |
| 60 |
+DESCRIPTION="official Python low-level client for Elasticsearch" |
| 61 |
+HOMEPAGE="http://elasticsearch-py.rtfd.org/" |
| 62 |
+SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz |
| 63 |
+ test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )" |
| 64 |
+ |
| 65 |
+LICENSE="Apache-2.0" |
| 66 |
+SLOT="0" |
| 67 |
+KEYWORDS="~amd64 ~x86" |
| 68 |
+IUSE="examples doc test" |
| 69 |
+ |
| 70 |
+RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}] |
| 71 |
+ <dev-python/urllib3-1.22[${PYTHON_USEDEP}]" |
| 72 |
+ |
| 73 |
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
| 74 |
+ >=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}] |
| 75 |
+ test? ( ${RDEPEND} |
| 76 |
+ >=dev-python/requests-2.0.0[${PYTHON_USEDEP}] |
| 77 |
+ <dev-python/requests-3.0.0[${PYTHON_USEDEP}] |
| 78 |
+ dev-python/nose[${PYTHON_USEDEP}] |
| 79 |
+ dev-python/coverage[${PYTHON_USEDEP}] |
| 80 |
+ dev-python/mock[${PYTHON_USEDEP}] |
| 81 |
+ dev-python/pretty-yaml[${PYTHON_USEDEP}] |
| 82 |
+ dev-python/nosexcover[${PYTHON_USEDEP}] |
| 83 |
+ virtual/jre:1.8 )" |
| 84 |
+ |
| 85 |
+# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py |
| 86 |
+python_test() { |
| 87 |
+ ES="${WORKDIR}/elasticsearch-${ES_VERSION}" |
| 88 |
+ ES_PORT="25124" |
| 89 |
+ ES_INSTANCE="gentoo-es-py-test" |
| 90 |
+ ES_LOG="${ES}/logs/${ES_INSTANCE}.log" |
| 91 |
+ PID="${ES}/elasticsearch.pid" |
| 92 |
+ |
| 93 |
+ # run Elasticsearch instance on custom port |
| 94 |
+ sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \ |
| 95 |
+ s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \ |
| 96 |
+ "${ES}/config/elasticsearch.yml" || die |
| 97 |
+ |
| 98 |
+ # start local instance of elasticsearch |
| 99 |
+ "${ES}"/bin/elasticsearch -d -p "${PID}" -Epath.repo=/ || die |
| 100 |
+ |
| 101 |
+ local i |
| 102 |
+ local es_started=0 |
| 103 |
+ for i in {1..20}; do |
| 104 |
+ grep -q "started" ${ES_LOG} 2> /dev/null |
| 105 |
+ if [[ $? -eq 0 ]]; then |
| 106 |
+ einfo "Elasticsearch started" |
| 107 |
+ es_started=1 |
| 108 |
+ eend 0 |
| 109 |
+ break |
| 110 |
+ elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then |
| 111 |
+ eend 1 |
| 112 |
+ eerror "Elasticsearch already running" |
| 113 |
+ die "Cannot start Elasticsearch for tests" |
| 114 |
+ else |
| 115 |
+ einfo "Waiting for Elasticsearch" |
| 116 |
+ eend 1 |
| 117 |
+ sleep 2 |
| 118 |
+ continue |
| 119 |
+ fi |
| 120 |
+ done |
| 121 |
+ |
| 122 |
+ [[ $es_started -eq 0 ]] && die "Elasticsearch failed to start" |
| 123 |
+ |
| 124 |
+ export TEST_ES_SERVER="localhost:${ES_PORT}" |
| 125 |
+ esetup.py test || die |
| 126 |
+ |
| 127 |
+ pkill -F ${PID} |
| 128 |
+} |
| 129 |
+ |
| 130 |
+python_compile_all() { |
| 131 |
+ cd docs || die |
| 132 |
+ emake man $(usex doc html "") |
| 133 |
+} |
| 134 |
+ |
| 135 |
+python_install_all() { |
| 136 |
+ use doc && HTML_DOCS=( docs/_build/html/. ) |
| 137 |
+ use examples && dodoc -r example |
| 138 |
+ doman docs/_build/man/* |
| 139 |
+ distutils-r1_python_install_all |
| 140 |
+} |
| 141 |
|
| 142 |
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-6.0.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-6.0.0.ebuild |
| 143 |
new file mode 100644 |
| 144 |
index 00000000000..327274043bc |
| 145 |
--- /dev/null |
| 146 |
+++ b/dev-python/elasticsearch-py/elasticsearch-py-6.0.0.ebuild |
| 147 |
@@ -0,0 +1,98 @@ |
| 148 |
+# Copyright 1999-2017 Gentoo Foundation |
| 149 |
+# Distributed under the terms of the GNU General Public License v2 |
| 150 |
+ |
| 151 |
+EAPI=6 |
| 152 |
+ |
| 153 |
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) |
| 154 |
+ |
| 155 |
+ES_VERSION="6.0.0" |
| 156 |
+ |
| 157 |
+inherit distutils-r1 |
| 158 |
+ |
| 159 |
+# tests fail in chroot |
| 160 |
+# https://github.com/elastic/elasticsearch/issues/12018 |
| 161 |
+RESTRICT="test" |
| 162 |
+ |
| 163 |
+MY_PN=${PN/-py/} |
| 164 |
+ |
| 165 |
+DESCRIPTION="official Python low-level client for Elasticsearch" |
| 166 |
+HOMEPAGE="http://elasticsearch-py.rtfd.org/" |
| 167 |
+SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz |
| 168 |
+ test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )" |
| 169 |
+ |
| 170 |
+LICENSE="Apache-2.0" |
| 171 |
+SLOT="0" |
| 172 |
+KEYWORDS="~amd64 ~x86" |
| 173 |
+IUSE="examples doc test" |
| 174 |
+ |
| 175 |
+RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}] |
| 176 |
+ <dev-python/urllib3-1.23[${PYTHON_USEDEP}]" |
| 177 |
+ |
| 178 |
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
| 179 |
+ >=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}] |
| 180 |
+ test? ( ${RDEPEND} |
| 181 |
+ >=dev-python/requests-2.0.0[${PYTHON_USEDEP}] |
| 182 |
+ <dev-python/requests-3.0.0[${PYTHON_USEDEP}] |
| 183 |
+ dev-python/nose[${PYTHON_USEDEP}] |
| 184 |
+ dev-python/coverage[${PYTHON_USEDEP}] |
| 185 |
+ dev-python/mock[${PYTHON_USEDEP}] |
| 186 |
+ dev-python/pretty-yaml[${PYTHON_USEDEP}] |
| 187 |
+ dev-python/nosexcover[${PYTHON_USEDEP}] |
| 188 |
+ virtual/jre:1.8 )" |
| 189 |
+ |
| 190 |
+# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py |
| 191 |
+python_test() { |
| 192 |
+ ES="${WORKDIR}/elasticsearch-${ES_VERSION}" |
| 193 |
+ ES_PORT="25124" |
| 194 |
+ ES_INSTANCE="gentoo-es-py-test" |
| 195 |
+ ES_LOG="${ES}/logs/${ES_INSTANCE}.log" |
| 196 |
+ PID="${ES}/elasticsearch.pid" |
| 197 |
+ |
| 198 |
+ # run Elasticsearch instance on custom port |
| 199 |
+ sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \ |
| 200 |
+ s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \ |
| 201 |
+ "${ES}/config/elasticsearch.yml" || die |
| 202 |
+ |
| 203 |
+ # start local instance of elasticsearch |
| 204 |
+ "${ES}"/bin/elasticsearch -d -p "${PID}" -Epath.repo=/ || die |
| 205 |
+ |
| 206 |
+ local i |
| 207 |
+ local es_started=0 |
| 208 |
+ for i in {1..20}; do |
| 209 |
+ grep -q "started" ${ES_LOG} 2> /dev/null |
| 210 |
+ if [[ $? -eq 0 ]]; then |
| 211 |
+ einfo "Elasticsearch started" |
| 212 |
+ es_started=1 |
| 213 |
+ eend 0 |
| 214 |
+ break |
| 215 |
+ elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then |
| 216 |
+ eend 1 |
| 217 |
+ eerror "Elasticsearch already running" |
| 218 |
+ die "Cannot start Elasticsearch for tests" |
| 219 |
+ else |
| 220 |
+ einfo "Waiting for Elasticsearch" |
| 221 |
+ eend 1 |
| 222 |
+ sleep 2 |
| 223 |
+ continue |
| 224 |
+ fi |
| 225 |
+ done |
| 226 |
+ |
| 227 |
+ [[ $es_started -eq 0 ]] && die "Elasticsearch failed to start" |
| 228 |
+ |
| 229 |
+ export TEST_ES_SERVER="localhost:${ES_PORT}" |
| 230 |
+ esetup.py test || die |
| 231 |
+ |
| 232 |
+ pkill -F ${PID} |
| 233 |
+} |
| 234 |
+ |
| 235 |
+python_compile_all() { |
| 236 |
+ cd docs || die |
| 237 |
+ emake man $(usex doc html "") |
| 238 |
+} |
| 239 |
+ |
| 240 |
+python_install_all() { |
| 241 |
+ use doc && HTML_DOCS=( docs/_build/html/. ) |
| 242 |
+ use examples && dodoc -r example |
| 243 |
+ doman docs/_build/man/* |
| 244 |
+ distutils-r1_python_install_all |
| 245 |
+} |
Archives