From 2de9aaae9b6018544ada7f67e2229605e1ec4d04 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Apr 2023 23:26:20 +0100 Subject: gentoo auto-resync : 05:04:2023 - 23:26:20 --- dev-python/elasticsearch-py/Manifest | 8 +- .../elasticsearch-py-7.17.6.ebuild | 193 --------------------- .../elasticsearch-py-7.17.9.ebuild | 183 ------------------- dev-python/elasticsearch-py/metadata.xml | 3 - 4 files changed, 1 insertion(+), 386 deletions(-) delete mode 100644 dev-python/elasticsearch-py/elasticsearch-py-7.17.6.ebuild delete mode 100644 dev-python/elasticsearch-py/elasticsearch-py-7.17.9.ebuild (limited to 'dev-python/elasticsearch-py') diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest index 1a22b2f3a390..090b884f3cb5 100644 --- a/dev-python/elasticsearch-py/Manifest +++ b/dev-python/elasticsearch-py/Manifest @@ -1,10 +1,4 @@ -DIST elasticsearch-7.17.6-no-jdk-linux-x86_64.tar.gz 167439665 BLAKE2B a0f2a57fbdd5bce1d476e410ec31555be7ebffa5961ad9b51d65753b50f05833e5991ee41c4b00906a8253146f72dc24895d5790a9d6afeea722d4b9b1a12443 SHA512 d3d1a16c2276d7ede911fc53915c988e17532a6481f9e4827677f6b40e6ccade6a9655a28bdb6460e98a4229f7cef807441e20afcdc161010f674ce1483da4f4 -DIST elasticsearch-7.17.9-linux-x86_64.tar.gz 315244963 BLAKE2B d08e99a857de9cf3b2d1db4b1788c7340b0efdfe2e0b0ea0ed172a4c13dfafb67d6337e18f65ee7dedb217296ef4aff01dcf8a47c8855504fb2249ac48f0d5a2 SHA512 f49d8fce010db83e6a89462535c71ba11a1153589038a7db430fc7db44178a55d5538dea80e6d4c690f4f0e838168965297c6a3ae31fbc5020af4d966067a90c DIST elasticsearch-8.6.2-linux-x86_64.tar.gz 581745209 BLAKE2B c5d76e8fd2b7b28d50a0b81950c5d824f5000d3239efef9c3312e153829f09d98ba1394dceff2f147c29e2cd24be2ea4aaf0e0dc830e51989b87c8c7b48e3b3c SHA512 4c5ea98af53861d6c7f06f855f3bd4f4f52136d8149347e43f633a23ba56d3237f6ff7346bf849090f4e52b28fc21c98df8d9b0f0f845a330834367705cd366a -DIST elasticsearch-py-7.17.6.gh.tar.gz 330159 BLAKE2B c72cf21ece1cc74c08f5f9a6718333bd89b6aece5902c4a053182bf63378b56afa84bb72cd7b07e7daba9eb19ac52f6c7f801124871cb4f555e456a66773218b SHA512 cb5f96e4e7a6c7a6bf52c55bcf3a4a3456574cea9815b002482a6e47a86c492d18aa85b3046ed6741361bd7e4e6fbc67c95a57b5a52e8320f102d3a5c1f4c719 -DIST elasticsearch-py-7.17.9.gh.tar.gz 330550 BLAKE2B 09f468e94408646cf8fe182137c50253852bdf4c79c2d6d90774bbc13f7c1ed1b08a5c52298873e986d8863b24527350ac0ec06b463047cb3b605573c732e0d9 SHA512 c05f22b5083da01833fbcfa4c0446efb19d0a8e5b541a07b8126c0597e6d513c2f5ead14f6d01d0f5ab29a7d20bcf80213576690fd66daa337ea555c6eaafae5 DIST elasticsearch-py-8.6.2.gh.tar.gz 517674 BLAKE2B c498f1e1efaea4c24f595f7e496f576372d6075da107b2f84a7d4a42c02de4e00d1459df6f965384f5880b4d8f910c4a7a49a773cb38361618ca7a74e5c4ec5a SHA512 53c03c9c8da4eb303e8f9cd5752bbef5a360d1e1a6fea4e98a8d576299f2ae4175c1da09429049cedf53a78bf86a4647fe4f4f9c7735a5a29977ada7db49e5fb -EBUILD elasticsearch-py-7.17.6.ebuild 9104 BLAKE2B b5e28f2d1d8d31c03b0bb783a7c7eb3a30893b019db3a722eae466c565461ff622117644ae570d6cebea1b05f1dbce40399c0b62123a360ab0b78bc25bcc77c4 SHA512 60bd5375467d590be4125c6f98aac445af239de27e0f3ee1cb45b9a7fd105960b43918077f4c3e43de730dee10ccd13a93c0b20c715a92f1fd947e5239453aa7 -EBUILD elasticsearch-py-7.17.9.ebuild 7321 BLAKE2B a43ebe5d65492d589cdace2803772ef69327e0ec5503d65313e02b509e121ccba2b93cd2148fdb18b927a38b4984250ead7794c565d5bd742fdc8da1333e68df SHA512 3e1287b36e8a885daefc5165d9bc5e5128d4db21097514be88405f223e02a73302fd8e2a3416bfd62ca6c43b6c99dac26753c4221aa575072436ad51a443cbe8 EBUILD elasticsearch-py-8.6.2.ebuild 4846 BLAKE2B 8ae2c02f8a3a0afac8f282df673d2f5e8e35baad2f99c207ada9b2239f7f333b0f3331c94e01883f5e6d42a6eaf02b0ede00cdfb725af0d377f5ddd43f8614f0 SHA512 d2beccbec9786ac1f4ec257b45c50da4814b71f3c01a07f1e6b87c933e39f8c29d17f764e3b90e12b09979071f351c64be1067d878a85c9379494814c7ce676d -MISC metadata.xml 601 BLAKE2B 56345ee1f417174399c98b5ed5ce11557b555a5ff8427bde703a455cfb6af71c3e56edf6f778981dd2684d74910f632f7a079a72b005e666fc35577943b4f500 SHA512 546374a9ba457b0f02b142d92daba3dccf39abc53f75bae9ace0a2f05187e6ff7eba7b1c3cd228176006a329e0ec403adbe51d24841c58c47479b000d41941b4 +MISC metadata.xml 540 BLAKE2B c44bd89e7a0e35b3ee5bc0a5899f32ed6309744a4c78bf63e5e0a78f073adec776cec810aff6757d4cf70381b954ddf0b7aed5420b5b085846f27b26ff7240cb SHA512 3f73bb387d67a7fd55271819d75f024e6ffdcb601542a779855b95f44cdb9e78b77d6fb059c69969e135caea7d1db2ed8a4ca2786c78faab5f8574973e2f02f9 diff --git a/dev-python/elasticsearch-py/elasticsearch-py-7.17.6.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-7.17.6.ebuild deleted file mode 100644 index aa0f0c26aff4..000000000000 --- a/dev-python/elasticsearch-py/elasticsearch-py-7.17.6.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..10} ) - -inherit distutils-r1 - -DESCRIPTION="Official Python low-level client for Elasticsearch" -HOMEPAGE="https://github.com/elastic/elasticsearch-py" -SRC_URI=" - https://github.com/elastic/elasticsearch-py/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz - test? ( - https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${PV}-no-jdk-linux-x86_64.tar.gz - ) -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="async doc" - -PROPERTIES="test_network" -RESTRICT="test" - -RDEPEND=" - dev-python/certifi[${PYTHON_USEDEP}] - >=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}] - =dev-python/aiohttp-3[${PYTHON_USEDEP}] - "${ES_DIR}/config/elasticsearch.yml" <<-EOF || die - # Run elasticsearch on custom port - http.port: ${es_port} - cluster.routing.allocation.disk.threshold_enabled: false - bootstrap.memory_lock: true - node.attr.testattr: test - repositories.url.allowed_urls: http://snapshot.test* - action.destructive_requires_name: false - ingest.geoip.downloader.enabled: false - - xpack.license.self_generated.type: basic - xpack.security.enabled: true - xpack.security.http.ssl.enabled: true - xpack.security.http.ssl.verification_mode: certificate - xpack.security.http.ssl.key: certs/testnode.key - xpack.security.http.ssl.certificate: certs/testnode.crt - xpack.security.http.ssl.certificate_authorities: certs/ca.crt - xpack.security.transport.ssl.enabled: true - xpack.security.transport.ssl.verification_mode: certificate - xpack.security.transport.ssl.key: certs/testnode.key - xpack.security.transport.ssl.certificate: certs/testnode.crt - xpack.security.transport.ssl.certificate_authorities: certs/ca.crt - EOF - - # Set password in keystore - printf "y\n${ELASTIC_PASSWORD}\n" | ${ES_DIR}/bin/elasticsearch-keystore add "bootstrap.password" || die - - # Deselect tests which require a non-free license in the server to succeed - local EPYTEST_DESELECT=( - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[token/11_invalidation[{0,1}] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[token/10_basic[{1..4}] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/jobs_get_result_record[{1..6}] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/jobs_get_result_influencer[{1..8}] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/datafeed_cat_apis[0] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/filter_crud[10] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/preview_data_frame_analytics[{3..5}] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/custom_all_field[{0,1}] - 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}] - 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}] - 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}] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/forecast[{1,2,3,4,5,6}] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/explain_data_frame_analytics[{3,5,6,7,8}] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/delete_expired_data[{0,1,2,3}] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/upgrade_job_snapshot[{0,1}] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/inference_processor[{0,1}] - 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}] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/trained_model_cat_apis[0] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/revert_model_snapshot[{0,1}] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/calendar_crud[{0,7,8,12,13,17,18}] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/stop_data_frame_analytics[{0,1,2,3,4,5}] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/jobs_get[{0,1,2,3,4}] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/preview_datafeed[{0,1,2,3,7,8,9}] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/data_frame_analytics_cat_apis[{0,1,2,3}] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/reset_job[{0,1}] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/ml_anomalies_default_mappings[{0,1}] - 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}] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/get_datafeeds[{0,1,2,3}] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/job_cat_apis[0] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[change_password/11_token[0] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[searchable_snapshots/10_usage[0] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[graph/10_basic[0] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[data_stream/10_data_stream_resolvability[4] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[xpack/20_info[0] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[authenticate/10_field_level_security[0] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[set_security_user/10_small_users_one_index[0] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[terms_enum/10_basic[{0..9}] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[security/hidden-index/14_security-tokens-7_read[{0,1,2}] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[security/hidden-index/13_security-tokens_read[{0,1,2}] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/jobs_get_result_records[{0..6}] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/jobs_get_result_influencers[{0..8}] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[license/20_put_license[{5,7,8}] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[license/30_enterprise_license[0] - test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[token/10_basic[0] - ) - - use async || EPYTEST_DESELECT+=( - test_elasticsearch/test_async test_elasticsearch/test_types/async_types.py - ) - - distutils-r1_src_test -} - -python_test() { - local es_instance="gentoo-py-test" - local es_log="${ES_DIR}/logs/${es_instance}-${EPYTHON}.log" - local es_temp="${T}/es_temp-${EPYTHON}" - local pid="${ES_DIR}/elasticsearch.pid" - - mkdir ${es_temp} || die - - ebegin "Starting Elasticsearch for ${EPYTHON}" - - # start local instance of elasticsearch - "${ES_DIR}"/bin/elasticsearch -d -p "${pid}" -Ecluster.name="${es_instance}-${EPYTHON}" -Epath.repo="${es_temp}" || die - - local i es_started=0 - for i in {1..20}; do - grep -q "started" ${es_log} 2> /dev/null - if [[ $? -eq 0 ]]; then - einfo "Elasticsearch started" - es_started=1 - 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" - sleep 2 - continue - fi - done - - [[ ${es_started} -eq 0 ]] && die "Elasticsearch failed to start" - - epytest - - pkill -F ${pid} || die -} diff --git a/dev-python/elasticsearch-py/elasticsearch-py-7.17.9.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-7.17.9.ebuild deleted file mode 100644 index 909205de40ea..000000000000 --- a/dev-python/elasticsearch-py/elasticsearch-py-7.17.9.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -inherit distutils-r1 - -DESCRIPTION="Official Elasticsearch client library for Python" -HOMEPAGE=" - https://ela.st/es-python - https://github.com/elastic/elasticsearch-py - https://pypi.org/project/elasticsearch/ -" -# Use bundled jdk for the test elasticsearch as there is no convenient way to ensure system jdk17 is used -SRC_URI=" - https://github.com/elastic/elasticsearch-py/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz - test? ( - amd64? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${PV}-linux-x86_64.tar.gz ) - ) -" - -LICENSE="Apache-2.0" -SLOT="0/$(ver_cut 1)" -KEYWORDS="~amd64 ~x86" - -RESTRICT=" - !amd64? ( test ) - !test? ( test ) -" - -RDEPEND=" - >=dev-python/aiohttp-3[${PYTHON_USEDEP}] =dev-python/urllib3-1.21.1[${PYTHON_USEDEP}] "${ES_DIR}/config/elasticsearch.yml" <<-EOF || die - # Run elasticsearch on custom port - http.port: ${es_port} - cluster.routing.allocation.disk.threshold_enabled: false - bootstrap.memory_lock: true - node.attr.testattr: test - repositories.url.allowed_urls: http://snapshot.test* - action.destructive_requires_name: false - ingest.geoip.downloader.enabled: false - - xpack.license.self_generated.type: basic - xpack.security.enabled: true - xpack.security.http.ssl.enabled: true - xpack.security.http.ssl.verification_mode: certificate - xpack.security.http.ssl.key: certs/testnode.key - xpack.security.http.ssl.certificate: certs/testnode.crt - xpack.security.http.ssl.certificate_authorities: certs/ca.crt - xpack.security.transport.ssl.enabled: true - xpack.security.transport.ssl.verification_mode: certificate - xpack.security.transport.ssl.key: certs/testnode.key - xpack.security.transport.ssl.certificate: certs/testnode.crt - xpack.security.transport.ssl.certificate_authorities: certs/ca.crt - EOF - - # Set password in keystore - printf "y\n${ELASTIC_PASSWORD}\n" | ${ES_DIR}/bin/elasticsearch-keystore add "bootstrap.password" || die - - local es_instance="gentoo-py-test" - local es_log="${ES_DIR}/logs/${es_instance}.log" - local es_temp="${T}/es_temp" - local pid="${ES_DIR}/elasticsearch.pid" - - mkdir ${es_temp} || die - - ebegin "Starting Elasticsearch for ${EPYTHON}" - - # start local instance of elasticsearch - "${ES_DIR}"/bin/elasticsearch -d -v -p "${pid}" \ - -Ecluster.name="${es_instance}" -Epath.repo="${es_temp}" || die - - local i es_started=0 - for i in {1..20}; do - grep -q "\] started" ${es_log} 2> /dev/null - if [[ $? -eq 0 ]]; then - einfo "Elasticsearch started" - es_started=1 - 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" - sleep 2 - continue - fi - done - - [[ ${es_started} -eq 0 ]] && die "Elasticsearch failed to start" - - distutils-r1_src_test - - pkill -F ${pid} || die - -} diff --git a/dev-python/elasticsearch-py/metadata.xml b/dev-python/elasticsearch-py/metadata.xml index 94ef681d4bf7..f5713ff4cfba 100644 --- a/dev-python/elasticsearch-py/metadata.xml +++ b/dev-python/elasticsearch-py/metadata.xml @@ -13,7 +13,4 @@ elastic/elasticsearch-py elasticsearch7 - - Add async support - -- cgit v1.2.3