Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/elasticsearch-py/
Date: Mon, 28 Oct 2019 14:43:48
Message-Id: 1572273722.4a9c597225192e339209125d00b215d02a861648.juippis@gentoo
1 commit: 4a9c597225192e339209125d00b215d02a861648
2 Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
3 AuthorDate: Fri Oct 25 05:30:14 2019 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 28 14:42:02 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a9c5972
7
8 dev-python/elasticsearch-py: drop old
9
10 Package-Manager: Portage-2.3.77, Repoman-2.3.17
11 Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
12 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
13
14 dev-python/elasticsearch-py/Manifest | 1 -
15 .../elasticsearch-py/elasticsearch-py-7.0.2.ebuild | 102 ---------------------
16 2 files changed, 103 deletions(-)
17
18 diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
19 index ed59119126f..4a8d6a4704a 100644
20 --- a/dev-python/elasticsearch-py/Manifest
21 +++ b/dev-python/elasticsearch-py/Manifest
22 @@ -2,5 +2,4 @@ DIST elasticsearch-oss-6.4.0.tar.gz 33727061 BLAKE2B dd0ff95bb124103ca340b480c51
23 DIST elasticsearch-oss-7.0.1-no-jdk-linux-x86_64.tar.gz 68787752 BLAKE2B 63864deae4e0545a2cd1924c4e2f4c0bb61134fe9649037f23c10123efe0425d376183035171a952a10f1804196a97287c59b508e97dff5e9e05063a67ede020 SHA512 301e552b221369cca8365ee64d8b52b5e8abea0e26159f7a6e77a1722fb1107641fe2472138869f5156bbbf43c74e62ffb22d0c35062190505f7504e3f571e16
24 DIST elasticsearch-py-6.3.1.tar.gz 90047 BLAKE2B 765d0a34bd22067e07f4e862eb72f2b67bd0db3516abdf76cdc0d4f24de3db6941b4dbc6afb6315667d640514415cf08ff6de127c84ab36ef9bf062d4e687d55 SHA512 b975a6b446b760bf62289e855768a26b9e104aba9cd399cf275f59f2755efa00bd55c99a746751dad2f7a18f581a1b124c1bb9b91f5c3dc9fb00138c9d198aea
25 DIST elasticsearch-py-6.4.0.tar.gz 97217 BLAKE2B 376768fab9bd7b4efd98f8cc24d4bad700f9bd2f9013a794e28986ee80463e5854399124bfde43a9a43d6773ee5e546fc28077452d2daab6e2e25810c045a986 SHA512 bb9a2fad3ca002b25fa58585cffdadf847a078f72a5b24297d58e1d598103cb38155ff61fd5802be8ccfec96daec3119ecb490f876c07263f103fbf26f6dc6d4
26 -DIST elasticsearch-py-7.0.2.tar.gz 102921 BLAKE2B 35ea3dd964a39caa594f380cea1508f0dea15486f1e0708f9daf3aa2e461429c76e0c7bf491a9aadb7187e30544597f6c41d20ff06b8b8d3b3b1655e6df387c9 SHA512 f91823dca2958fd0292ba623599d89138dd83ed2d41ecef1d5dcdd30a66c87db99d0576f41da15affd4e0027355eb20437e2dc104f98ffa86d0066d0b04b2590
27 DIST elasticsearch-py-7.0.5.tar.gz 110079 BLAKE2B 89f5f7434fae0c4d20c1780c0979a419278fcaa23f75d5241d48c695905e566742fac5651387f0b1cb665ab6e9cb299406ee7f0157facc8c4cf2c1f1a4a3e5d7 SHA512 c4224cee6f7739ad932036f2afc6ed20ead16829d42f40b79e08d6714b4a247f019175739fb5a93bcea5bba391bd9f54cadcd31d42ff9411da414d08c140049b
28
29 diff --git a/dev-python/elasticsearch-py/elasticsearch-py-7.0.2.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-7.0.2.ebuild
30 deleted file mode 100644
31 index d307f3933ab..00000000000
32 --- a/dev-python/elasticsearch-py/elasticsearch-py-7.0.2.ebuild
33 +++ /dev/null
34 @@ -1,102 +0,0 @@
35 -# Copyright 1999-2019 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=7
39 -
40 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
41 -ES_VERSION="7.0.1"
42 -
43 -inherit distutils-r1
44 -
45 -MY_PN=${PN/-py/}
46 -DESCRIPTION="Official Python low-level client for Elasticsearch"
47 -HOMEPAGE="https://github.com/elastic/elasticsearch-py"
48 -SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
49 - test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-${ES_VERSION}-no-jdk-linux-x86_64.tar.gz )"
50 -
51 -LICENSE="Apache-2.0"
52 -SLOT="0"
53 -KEYWORDS="~amd64 ~x86"
54 -IUSE="doc examples test"
55 -
56 -# tests fail in chroot
57 -# https://github.com/elastic/elasticsearch/issues/12018
58 -RESTRICT="test"
59 -
60 -RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]"
61 -
62 -DEPEND="test? ( ${RDEPEND}
63 - >=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
64 - <dev-python/requests-3.0.0[${PYTHON_USEDEP}]
65 - dev-python/nose[${PYTHON_USEDEP}]
66 - dev-python/mock[${PYTHON_USEDEP}]
67 - dev-python/pretty-yaml[${PYTHON_USEDEP}]
68 - virtual/jre:1.8 )"
69 -
70 -BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
71 - >=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]"
72 -
73 -python_prepare_all() {
74 - sed -e '/coverage/d' \
75 - -e '/nosexcover/d' \
76 - -i setup.py || die
77 -
78 - distutils-r1_python_prepare_all
79 -}
80 -
81 -python_compile_all() {
82 - emake -C docs -j1 man $(usex doc html "")
83 -}
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 - export JAVA_HOME=$(java-config -g JAVA_HOME)
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: ${ES_INSTANCE}/g" \
97 - "${ES}/config/elasticsearch.yml" || die
98 -
99 - # start local instance of elasticsearch
100 - "${ES}"/bin/elasticsearch -d -p "${PID}" -Epath.repo=/ || die
101 -
102 - local i
103 - local es_started=0
104 - for i in {1..20}; do
105 - grep -q "started" ${ES_LOG} 2> /dev/null
106 - if [[ $? -eq 0 ]]; then
107 - einfo "Elasticsearch started"
108 - es_started=1
109 - eend 0
110 - break
111 - elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
112 - eend 1
113 - eerror "Elasticsearch already running"
114 - die "Cannot start Elasticsearch for tests"
115 - else
116 - einfo "Waiting for Elasticsearch"
117 - eend 1
118 - sleep 2
119 - continue
120 - fi
121 - done
122 -
123 - [[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
124 -
125 - export TEST_ES_SERVER="localhost:${ES_PORT}"
126 - nosetests -v || die
127 -
128 - pkill -F ${PID} || die
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 -}