1 |
commit: d97a9b0c0461f2e2b2eab937edd0c8d1512fa553 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 26 06:14:44 2022 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 26 06:14:44 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d97a9b0c |
7 |
|
8 |
dev-python/elasticsearch-py: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/elasticsearch-py/Manifest | 2 - |
13 |
.../elasticsearch-py-7.14.1.ebuild | 186 --------------------- |
14 |
2 files changed, 188 deletions(-) |
15 |
|
16 |
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest |
17 |
index 9f2760a10e0c..6a46a4588eaa 100644 |
18 |
--- a/dev-python/elasticsearch-py/Manifest |
19 |
+++ b/dev-python/elasticsearch-py/Manifest |
20 |
@@ -1,4 +1,2 @@ |
21 |
-DIST elasticsearch-7.14.1-no-jdk-linux-x86_64.tar.gz 191559419 BLAKE2B c4099d2e7a121b47549b44c081f60cd966a371a01827aa19380d171619cb6ef6f30fd411f75de00d41c6a93df2c899ac9dbc5cf2bf2264d7885ace6a61cf55c3 SHA512 77dca78ba865ae74863b3b2a3cd61e8a8e4478cd02eb020184dbf89fa32cf145a6bbd1d11a1cb88c2236a3b8cdb8b0047e3c0f1a40f609f31b898c905b2c211d |
22 |
DIST elasticsearch-7.17.6-no-jdk-linux-x86_64.tar.gz 167439665 BLAKE2B a0f2a57fbdd5bce1d476e410ec31555be7ebffa5961ad9b51d65753b50f05833e5991ee41c4b00906a8253146f72dc24895d5790a9d6afeea722d4b9b1a12443 SHA512 d3d1a16c2276d7ede911fc53915c988e17532a6481f9e4827677f6b40e6ccade6a9655a28bdb6460e98a4229f7cef807441e20afcdc161010f674ce1483da4f4 |
23 |
-DIST elasticsearch-py-7.14.1.tar.gz 302277 BLAKE2B a4502edbaf1dbca9c687a32f012305fee7520555dd23f05888fcb8b82e2a9ffa3f9c5208320eca4ea8033498cd0a951003b94662b6847da664f302b8c2763004 SHA512 49b4e0cddc210e0d73cb7cb28f38dae4fd0595e22733cf017c41f50731479a1a3672307a119b067a0b5c1de3a138908e337145effd2b66bf930c2d439cd2ce0b |
24 |
DIST elasticsearch-py-7.17.6.gh.tar.gz 330159 BLAKE2B c72cf21ece1cc74c08f5f9a6718333bd89b6aece5902c4a053182bf63378b56afa84bb72cd7b07e7daba9eb19ac52f6c7f801124871cb4f555e456a66773218b SHA512 cb5f96e4e7a6c7a6bf52c55bcf3a4a3456574cea9815b002482a6e47a86c492d18aa85b3046ed6741361bd7e4e6fbc67c95a57b5a52e8320f102d3a5c1f4c719 |
25 |
|
26 |
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-7.14.1.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-7.14.1.ebuild |
27 |
deleted file mode 100644 |
28 |
index 5221509155fb..000000000000 |
29 |
--- a/dev-python/elasticsearch-py/elasticsearch-py-7.14.1.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,186 +0,0 @@ |
32 |
-# Copyright 1999-2021 Gentoo Authors |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=8 |
36 |
- |
37 |
-PYTHON_COMPAT=( python3_{8..10} ) |
38 |
- |
39 |
-inherit distutils-r1 |
40 |
- |
41 |
-DESCRIPTION="Official Python low-level client for Elasticsearch" |
42 |
-HOMEPAGE="https://github.com/elastic/elasticsearch-py" |
43 |
-SRC_URI=" |
44 |
- https://github.com/elastic/elasticsearch-py/archive/v${PV}.tar.gz -> ${P}.tar.gz |
45 |
- test? ( |
46 |
- https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${PV}-no-jdk-linux-x86_64.tar.gz |
47 |
- )" |
48 |
- |
49 |
-LICENSE="Apache-2.0" |
50 |
-SLOT="0" |
51 |
-KEYWORDS="amd64 x86" |
52 |
-IUSE="async doc test" |
53 |
- |
54 |
-PROPERTIES="test_network" |
55 |
-RESTRICT="test" |
56 |
- |
57 |
-RDEPEND=" |
58 |
- dev-python/certifi[${PYTHON_USEDEP}] |
59 |
- >=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}] |
60 |
- <dev-python/urllib3-2.0.0[${PYTHON_USEDEP}] |
61 |
- async? ( |
62 |
- >=dev-python/aiohttp-3[${PYTHON_USEDEP}] |
63 |
- <dev-python/aiohttp-4[${PYTHON_USEDEP}] |
64 |
- )" |
65 |
-DEPEND=" |
66 |
- test? ( |
67 |
- ${RDEPEND} |
68 |
- >=dev-python/requests-2.0.0[${PYTHON_USEDEP}] |
69 |
- <dev-python/requests-3.0.0[${PYTHON_USEDEP}] |
70 |
- dev-python/aiohttp[${PYTHON_USEDEP}] |
71 |
- dev-python/mock[${PYTHON_USEDEP}] |
72 |
- dev-python/numpy[${PYTHON_USEDEP}] |
73 |
- dev-python/pandas[${PYTHON_USEDEP}] |
74 |
- dev-python/python-dateutil[${PYTHON_USEDEP}] |
75 |
- >=dev-python/pyyaml-5.4[${PYTHON_USEDEP}] |
76 |
- virtual/jre:* |
77 |
- async? ( |
78 |
- dev-python/pytest-asyncio[${PYTHON_USEDEP}] |
79 |
- dev-python/unasync[${PYTHON_USEDEP}] |
80 |
- ) |
81 |
- )" |
82 |
- |
83 |
-distutils_enable_sphinx docs/sphinx dev-python/sphinx_rtd_theme |
84 |
-distutils_enable_tests pytest |
85 |
- |
86 |
-src_prepare() { |
87 |
- default_src_prepare |
88 |
- |
89 |
- if use test; then |
90 |
- local es_port="25124" |
91 |
- |
92 |
- export ES_DIR="${WORKDIR}/elasticsearch-${PV}" |
93 |
- export ES_INSTANCE="gentoo-es-py-test" |
94 |
- export ES_JAVA_HOME=$(java-config -g JAVA_HOME || die) |
95 |
- export ELASTIC_PASSWORD="changeme" |
96 |
- export ELASTICSEARCH_URL="https://elastic:${ELASTIC_PASSWORD}@localhost:${es_port}" |
97 |
- |
98 |
- cp -r "${S}/.ci/certs" "${ES_DIR}/config" || die |
99 |
- |
100 |
- cat <<EOF > "${ES_DIR}/config/elasticsearch.yml" || die |
101 |
-# Run elasticsearch on custom port |
102 |
-http.port: ${es_port} |
103 |
-cluster.routing.allocation.disk.threshold_enabled: false |
104 |
-bootstrap.memory_lock: true |
105 |
-node.attr.testattr: test |
106 |
-repositories.url.allowed_urls: http://snapshot.test* |
107 |
-action.destructive_requires_name: false |
108 |
-ingest.geoip.downloader.enabled: false |
109 |
- |
110 |
-xpack.license.self_generated.type: basic |
111 |
-xpack.security.enabled: true |
112 |
-xpack.security.http.ssl.enabled: true |
113 |
-xpack.security.http.ssl.verification_mode: certificate |
114 |
-xpack.security.http.ssl.key: certs/testnode.key |
115 |
-xpack.security.http.ssl.certificate: certs/testnode.crt |
116 |
-xpack.security.http.ssl.certificate_authorities: certs/ca.crt |
117 |
-xpack.security.transport.ssl.enabled: true |
118 |
-xpack.security.transport.ssl.verification_mode: certificate |
119 |
-xpack.security.transport.ssl.key: certs/testnode.key |
120 |
-xpack.security.transport.ssl.certificate: certs/testnode.crt |
121 |
-xpack.security.transport.ssl.certificate_authorities: certs/ca.crt |
122 |
-EOF |
123 |
- |
124 |
- # Set password in keystore |
125 |
- printf "y\n${ELASTIC_PASSWORD}\n" | ${ES_DIR}/bin/elasticsearch-keystore add "bootstrap.password" || die |
126 |
- |
127 |
- # Deselect tests which require a non-free license in the server to succeed |
128 |
- EPYTEST_DESELECT+=( |
129 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[token/11_invalidation[{0,1}] |
130 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[token/10_basic[{1..4}] |
131 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/jobs_get_result_record[{1..6}] |
132 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/jobs_get_result_influencer[{1..8}] |
133 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/datafeed_cat_apis[0] |
134 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/filter_crud[10] |
135 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/preview_data_frame_analytics[{3..5}] |
136 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/custom_all_field[{0,1}] |
137 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/data_frame_analytics_crud[{1,5,6,13,29,38,39,40,42,62,76,77,78,80,81,82,83}] |
138 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/start_data_frame_analytics[{0,1,2,3,4,6,7,8}] |
139 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/jobs_get_result_categories[{0,1,2,3,4,5,6,7}] |
140 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/forecast[{1,2,3,4,5,6}] |
141 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/explain_data_frame_analytics[{3,5,6,7,8}] |
142 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/delete_expired_data[{0,1,2,3}] |
143 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/upgrade_job_snapshot[{0,1}] |
144 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/inference_processor[{0,1}] |
145 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/jobs_get_result_buckets[{0,1,2,3,4,5,6,7,8,9,10,11}] |
146 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/trained_model_cat_apis[0] |
147 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/revert_model_snapshot[{0,1}] |
148 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/calendar_crud[{0,7,8,12,13,17,18}] |
149 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/stop_data_frame_analytics[{0,1,2,3,4,5}] |
150 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/jobs_get[{0,1,2,3,4}] |
151 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/preview_datafeed[{0,1,2,3,7,8,9}] |
152 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/data_frame_analytics_cat_apis[{0,1,2,3}] |
153 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/reset_job[{0,1}] |
154 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/ml_anomalies_default_mappings[{0,1}] |
155 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/get_model_snapshots[{0,1,2,3,4,5,6,7}] |
156 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/get_datafeeds[{0,1,2,3}] |
157 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/job_cat_apis[0] |
158 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[change_password/11_token[0] |
159 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[searchable_snapshots/10_usage[0] |
160 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[graph/10_basic[0] |
161 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[data_stream/10_data_stream_resolvability[4] |
162 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[xpack/20_info[0] |
163 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[authenticate/10_field_level_security[0] |
164 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[set_security_user/10_small_users_one_index[0] |
165 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[terms_enum/10_basic[{0..9}] |
166 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[security/hidden-index/14_security-tokens-7_read[{0,1,2}] |
167 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[security/hidden-index/13_security-tokens_read[{0,1,2}] |
168 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/jobs_get_result_records[{0..6}] |
169 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/jobs_get_result_influencers[{0..8}] |
170 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[license/20_put_license[{5,7,8}] |
171 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[license/30_enterprise_license[0] |
172 |
- test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[token/10_basic[0] |
173 |
- ) |
174 |
- |
175 |
- use async || EPYTEST_DESELECT+=( test_elasticsearch/test_async test_elasticsearch/test_types/async_types.py ) |
176 |
- export EPYTEST_DESELECT |
177 |
- fi |
178 |
-} |
179 |
- |
180 |
-python_test() { |
181 |
- local es_instance="gentoo-py-test" |
182 |
- local es_log="${ES_DIR}/logs/${es_instance}-${EPYTHON}.log" |
183 |
- local es_temp="${T}/es_temp-${EPYTHON}" |
184 |
- local pid="${ES_DIR}/elasticsearch.pid" |
185 |
- |
186 |
- mkdir ${es_temp} || die |
187 |
- |
188 |
- # start local instance of elasticsearch |
189 |
- "${ES_DIR}"/bin/elasticsearch -d -p "${pid}" -Ecluster.name=${es_instance}-${EPYTHON} -Epath.repo=${es_temp}|| die |
190 |
- |
191 |
- local i |
192 |
- local es_started=0 |
193 |
- for i in {1..20}; do |
194 |
- grep -q "started" ${es_log} 2> /dev/null |
195 |
- if [[ $? -eq 0 ]]; then |
196 |
- einfo "Elasticsearch started" |
197 |
- es_started=1 |
198 |
- eend 0 |
199 |
- break |
200 |
- elif grep -q 'BindException\[Address already in use\]' "${es_log}" 2>/dev/null; then |
201 |
- eend 1 |
202 |
- eerror "Elasticsearch already running" |
203 |
- die "Cannot start Elasticsearch for tests" |
204 |
- else |
205 |
- einfo "Waiting for Elasticsearch" |
206 |
- eend 1 |
207 |
- sleep 2 |
208 |
- continue |
209 |
- fi |
210 |
- done |
211 |
- |
212 |
- [[ $es_started -eq 0 ]] && die "Elasticsearch failed to start" |
213 |
- |
214 |
- epytest |
215 |
- |
216 |
- pkill -F ${pid} || die |
217 |
-} |