From f2cad13df67f28087ea918fa6a4f0a6de62e24ea Mon Sep 17 00:00:00 2001 From: Tomas Mozes Date: Fri, 25 Oct 2019 07:28:43 +0200 Subject: [PATCH 1/3] dev-python/elasticsearch-py: bump to 7.0.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/692542 Package-Manager: Portage-2.3.77, Repoman-2.3.17 Signed-off-by: Tomáš Mózes --- dev-python/elasticsearch-py/Manifest | 1 + .../elasticsearch-py-7.0.5.ebuild | 102 ++++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 dev-python/elasticsearch-py/elasticsearch-py-7.0.5.ebuild diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest index 051fd47a9ef01..ed59119126f25 100644 --- a/dev-python/elasticsearch-py/Manifest +++ b/dev-python/elasticsearch-py/Manifest @@ -3,3 +3,4 @@ DIST elasticsearch-oss-7.0.1-no-jdk-linux-x86_64.tar.gz 68787752 BLAKE2B 63864de DIST elasticsearch-py-6.3.1.tar.gz 90047 BLAKE2B 765d0a34bd22067e07f4e862eb72f2b67bd0db3516abdf76cdc0d4f24de3db6941b4dbc6afb6315667d640514415cf08ff6de127c84ab36ef9bf062d4e687d55 SHA512 b975a6b446b760bf62289e855768a26b9e104aba9cd399cf275f59f2755efa00bd55c99a746751dad2f7a18f581a1b124c1bb9b91f5c3dc9fb00138c9d198aea DIST elasticsearch-py-6.4.0.tar.gz 97217 BLAKE2B 376768fab9bd7b4efd98f8cc24d4bad700f9bd2f9013a794e28986ee80463e5854399124bfde43a9a43d6773ee5e546fc28077452d2daab6e2e25810c045a986 SHA512 bb9a2fad3ca002b25fa58585cffdadf847a078f72a5b24297d58e1d598103cb38155ff61fd5802be8ccfec96daec3119ecb490f876c07263f103fbf26f6dc6d4 DIST elasticsearch-py-7.0.2.tar.gz 102921 BLAKE2B 35ea3dd964a39caa594f380cea1508f0dea15486f1e0708f9daf3aa2e461429c76e0c7bf491a9aadb7187e30544597f6c41d20ff06b8b8d3b3b1655e6df387c9 SHA512 f91823dca2958fd0292ba623599d89138dd83ed2d41ecef1d5dcdd30a66c87db99d0576f41da15affd4e0027355eb20437e2dc104f98ffa86d0066d0b04b2590 +DIST elasticsearch-py-7.0.5.tar.gz 110079 BLAKE2B 89f5f7434fae0c4d20c1780c0979a419278fcaa23f75d5241d48c695905e566742fac5651387f0b1cb665ab6e9cb299406ee7f0157facc8c4cf2c1f1a4a3e5d7 SHA512 c4224cee6f7739ad932036f2afc6ed20ead16829d42f40b79e08d6714b4a247f019175739fb5a93bcea5bba391bd9f54cadcd31d42ff9411da414d08c140049b diff --git a/dev-python/elasticsearch-py/elasticsearch-py-7.0.5.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-7.0.5.ebuild new file mode 100644 index 0000000000000..f12fb68275e3d --- /dev/null +++ b/dev-python/elasticsearch-py/elasticsearch-py-7.0.5.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy ) +ES_VERSION="7.0.1" + +inherit distutils-r1 + +MY_PN=${PN/-py/} +DESCRIPTION="Official Python low-level client for Elasticsearch" +HOMEPAGE="https://github.com/elastic/elasticsearch-py" +SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz + test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-${ES_VERSION}-no-jdk-linux-x86_64.tar.gz )" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc examples test" + +# tests fail in chroot +# https://github.com/elastic/elasticsearch/issues/12018 +RESTRICT="test" + +RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]" + +DEPEND="test? ( ${RDEPEND} + >=dev-python/requests-2.0.0[${PYTHON_USEDEP}] + /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" + eend 1 + sleep 2 + continue + fi + done + + [[ $es_started -eq 0 ]] && die "Elasticsearch failed to start" + + export TEST_ES_SERVER="localhost:${ES_PORT}" + nosetests -v || die + + pkill -F ${PID} || die +} + +python_install_all() { + use doc && HTML_DOCS=( docs/_build/html/. ) + use examples && dodoc -r example + doman docs/_build/man/* + distutils-r1_python_install_all +} From e824c80e79cba29b3d9a76b26bec64b97811f40a Mon Sep 17 00:00:00 2001 From: Tomas Mozes Date: Fri, 25 Oct 2019 07:30:14 +0200 Subject: [PATCH 2/3] dev-python/elasticsearch-py: drop old MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-2.3.77, Repoman-2.3.17 Signed-off-by: Tomáš Mózes --- dev-python/elasticsearch-py/Manifest | 1 - .../elasticsearch-py-7.0.2.ebuild | 102 ------------------ 2 files changed, 103 deletions(-) delete mode 100644 dev-python/elasticsearch-py/elasticsearch-py-7.0.2.ebuild diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest index ed59119126f25..4a8d6a4704a41 100644 --- a/dev-python/elasticsearch-py/Manifest +++ b/dev-python/elasticsearch-py/Manifest @@ -2,5 +2,4 @@ DIST elasticsearch-oss-6.4.0.tar.gz 33727061 BLAKE2B dd0ff95bb124103ca340b480c51 DIST elasticsearch-oss-7.0.1-no-jdk-linux-x86_64.tar.gz 68787752 BLAKE2B 63864deae4e0545a2cd1924c4e2f4c0bb61134fe9649037f23c10123efe0425d376183035171a952a10f1804196a97287c59b508e97dff5e9e05063a67ede020 SHA512 301e552b221369cca8365ee64d8b52b5e8abea0e26159f7a6e77a1722fb1107641fe2472138869f5156bbbf43c74e62ffb22d0c35062190505f7504e3f571e16 DIST elasticsearch-py-6.3.1.tar.gz 90047 BLAKE2B 765d0a34bd22067e07f4e862eb72f2b67bd0db3516abdf76cdc0d4f24de3db6941b4dbc6afb6315667d640514415cf08ff6de127c84ab36ef9bf062d4e687d55 SHA512 b975a6b446b760bf62289e855768a26b9e104aba9cd399cf275f59f2755efa00bd55c99a746751dad2f7a18f581a1b124c1bb9b91f5c3dc9fb00138c9d198aea DIST elasticsearch-py-6.4.0.tar.gz 97217 BLAKE2B 376768fab9bd7b4efd98f8cc24d4bad700f9bd2f9013a794e28986ee80463e5854399124bfde43a9a43d6773ee5e546fc28077452d2daab6e2e25810c045a986 SHA512 bb9a2fad3ca002b25fa58585cffdadf847a078f72a5b24297d58e1d598103cb38155ff61fd5802be8ccfec96daec3119ecb490f876c07263f103fbf26f6dc6d4 -DIST elasticsearch-py-7.0.2.tar.gz 102921 BLAKE2B 35ea3dd964a39caa594f380cea1508f0dea15486f1e0708f9daf3aa2e461429c76e0c7bf491a9aadb7187e30544597f6c41d20ff06b8b8d3b3b1655e6df387c9 SHA512 f91823dca2958fd0292ba623599d89138dd83ed2d41ecef1d5dcdd30a66c87db99d0576f41da15affd4e0027355eb20437e2dc104f98ffa86d0066d0b04b2590 DIST elasticsearch-py-7.0.5.tar.gz 110079 BLAKE2B 89f5f7434fae0c4d20c1780c0979a419278fcaa23f75d5241d48c695905e566742fac5651387f0b1cb665ab6e9cb299406ee7f0157facc8c4cf2c1f1a4a3e5d7 SHA512 c4224cee6f7739ad932036f2afc6ed20ead16829d42f40b79e08d6714b4a247f019175739fb5a93bcea5bba391bd9f54cadcd31d42ff9411da414d08c140049b diff --git a/dev-python/elasticsearch-py/elasticsearch-py-7.0.2.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-7.0.2.ebuild deleted file mode 100644 index d307f3933ab3b..0000000000000 --- a/dev-python/elasticsearch-py/elasticsearch-py-7.0.2.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy ) -ES_VERSION="7.0.1" - -inherit distutils-r1 - -MY_PN=${PN/-py/} -DESCRIPTION="Official Python low-level client for Elasticsearch" -HOMEPAGE="https://github.com/elastic/elasticsearch-py" -SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-${ES_VERSION}-no-jdk-linux-x86_64.tar.gz )" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples test" - -# tests fail in chroot -# https://github.com/elastic/elasticsearch/issues/12018 -RESTRICT="test" - -RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]" - -DEPEND="test? ( ${RDEPEND} - >=dev-python/requests-2.0.0[${PYTHON_USEDEP}] - /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" - eend 1 - sleep 2 - continue - fi - done - - [[ $es_started -eq 0 ]] && die "Elasticsearch failed to start" - - export TEST_ES_SERVER="localhost:${ES_PORT}" - nosetests -v || die - - pkill -F ${PID} || die -} - -python_install_all() { - use doc && HTML_DOCS=( docs/_build/html/. ) - use examples && dodoc -r example - doman docs/_build/man/* - distutils-r1_python_install_all -} From 286f9d0db45c66ef8d9245ee05c3f851512e7937 Mon Sep 17 00:00:00 2001 From: Tomas Mozes Date: Fri, 25 Oct 2019 11:48:11 +0200 Subject: [PATCH 3/3] dev-python/elasticsearch-curator: bump to 5.8.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/696632 Package-Manager: Portage-2.3.77, Repoman-2.3.17 Signed-off-by: Tomáš Mózes --- dev-python/elasticsearch-curator/Manifest | 2 + .../elasticsearch-curator-5.8.1.ebuild | 159 ++++++++++++++++++ 2 files changed, 161 insertions(+) create mode 100644 dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1.ebuild diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest index 3d7731c867f7b..cc3cbecf2ab1c 100644 --- a/dev-python/elasticsearch-curator/Manifest +++ b/dev-python/elasticsearch-curator/Manifest @@ -1,4 +1,6 @@ +DIST elasticsearch-7.3.2-linux-x86_64.tar.gz 285050383 BLAKE2B 730d8550f5887facae3075ce3b0bdb96b49350782fe7e687b8f4477bb363ce7c1595f2b1ece2b7d59d18539886b6e4806f56b0f5674bc417528232a92f1c00a8 SHA512 08e89347797ec6f008fb76cda17ec3e0dbc553fc992d07f4944fd99d17d5bc934849d9e534724d1541432c9844d3da57d875bc08a0c4cd95ba4251e2b03f833b DIST elasticsearch-curator-5.5.4.tar.gz 221161 BLAKE2B 41828800dd9237142767d3163b3d87770ea5b904858991598cce2feb7c3a22d85c0d73275a2f232099ea82e7346fc20080a3bfef692ee808b730d3e4e6de405d SHA512 99ed18592105d19791513ad713115b6e2a6b589ab8b4e3fc4435b2878e25f552e0bda8d63cb6279970afc6ba39d9f3db17af1b4fb44500fe8a14b060e1530258 DIST elasticsearch-curator-5.6.0.tar.gz 221555 BLAKE2B cbf1f645b266d2d08914ff74fd5c63bcd5661ef68a8b9286ed59b05d52d50e18e8d18e00b3a0e037f8e6452ce79213280b5ecffaf6af0a3fb70ef92458c80efa SHA512 7dc02b5d15228ea96254dc7dd8069d8396c5d3df883b7ab42936c7612b0f16f5399131563703ccd05469facee7ddf20a720daf62a2713943a4b9a0c9448dd676 +DIST elasticsearch-curator-5.8.1.tar.gz 231233 BLAKE2B d2369c18be69cc5c8e17a6d7a72660bd7165c349cdb06c740c8db9dd2b583f181a09ba7d53ee0f4692cb6e31d373274f0610f2a654ba4a6da2d0ca0ff22c7c97 SHA512 500767967f423629f34d42ee088a9c007e193216c42f5590364ffcacc9e1efeba65dd4d333f806250e3b7fe0bea8b5501d1e6f3bf6fb0b8c46a46954e92c4a65 DIST elasticsearch-oss-6.3.2.tar.gz 29418577 BLAKE2B 152640dc01a10f44ba43f87f68361cc0dd5e1cf54d0ff92377f3acd1a12a247f002ffe2d003cc53760e891278249c10b1d6d4eb978b0bb1c1ebf8879a2cfcb9a SHA512 3c51a860414f7e55900b1d9a350bdbc3e673c8445e316454c2480315b4b9fc08df58090c6281cecc3ae63d12d78d6bd58e228b3371aa325db799ce18758a21f4 DIST elasticsearch-oss-6.4.3.tar.gz 33727639 BLAKE2B b4f4821af7a2447a6a16158c32bf676ebbfd8598fde8af558dd19d6e365df66be17d0984e3acb9380a0d5e0cff486b85f6edf96312bd3bb3fc5ae52c270306f3 SHA512 b1147baa95119a8a96779125351358b4c62f2a546b65a9750c11d1d1b9270f06db6da8ff1d9ad11efade1eaea8487087e2d8839b0edfc5da6d9b54da6c6df4e7 diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1.ebuild new file mode 100644 index 0000000000000..f822977ef9217 --- /dev/null +++ b/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) + +MY_PN="curator" +ES_VERSION="7.3.2" + +inherit distutils-r1 + +DESCRIPTION="Tending time-series indices in Elasticsearch" +HOMEPAGE="https://github.com/elasticsearch/curator" +SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}-linux-x86_64.tar.gz )" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +# tests fail in chroot +# https://github.com/elastic/elasticsearch/issues/12018 +RESTRICT="test" +IUSE="doc test" + +# vulnerable pyyaml +# https://github.com/elastic/curator/issues/1415 +RDEPEND=" + >=dev-python/elasticsearch-py-7.0.4[${PYTHON_USEDEP}] + =dev-python/click-6.7[${PYTHON_USEDEP}] + =dev-python/certifi-2019.9.11[${PYTHON_USEDEP}] + >=dev-python/requests-2.20.0[${PYTHON_USEDEP}] + >=dev-python/urllib3-1.24.2[${PYTHON_USEDEP}] + =dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/six-1.11.0[${PYTHON_USEDEP}] + dev-python/sphinx + ~dev-python/pyyaml-3.13[${PYTHON_USEDEP}] + test? ( ${RDEPEND} + virtual/jre + dev-python/mock[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] )" + +S="${WORKDIR}/${MY_PN}-${PV}" + +python_prepare_all() { + # avoid downloading from net + sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die + + # requests_aws4auth not in portage + sed -e '/boto3/d' \ + -e '/requests_aws4auth/d' \ + -e '/tests_require/s/, "coverage", "nosexcover"//g' \ + -i setup.cfg setup.py || die + + distutils-r1_python_prepare_all +} + +python_compile_all() { + emake -C docs -j1 man $(usex doc html "") +} + +# running tests in non-chroot environments: +# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator +python_test_all() { + # starts two ES instances (local,remote) and runs the tests + # https://github.com/elastic/curator/blob/master/travis-run.sh + local ES_INSTANCES="local remote" + local ES_PATH="${WORKDIR}/elasticsearch-${ES_VERSION}" + + declare -A ES_PORT + ES_PORT[local]=9200 + ES_PORT[remote]=9201 + + local i transport + declare -A ES_CONFIG_DIR ES_CONFIG_PATH ES_INSTANCE ES_LOG ES_PID + for i in ${ES_INSTANCES}; do + ES_CONFIG_DIR[$i]="${ES_PATH}/$i" + ES_CONFIG_PATH[$i]="${ES_CONFIG_DIR[$i]}/elasticsearch.yml" + ES_PID[$i]="${ES_PATH}/$i.pid" + ES_LOG[$i]="${ES_PATH}/logs/$i.log" + done + + # configure ES instances + for i in ${ES_INSTANCES}; do + mkdir -p "${ES_CONFIG_DIR[$i]}" || die + cp ${ES_PATH}/config/{jvm.options,log4j2.properties} "${ES_CONFIG_DIR[$i]}"/ || die + echo 'network.host: 127.0.0.1' > "${ES_CONFIG_PATH[$i]}" || die + echo "http.port: ${ES_PORT[$i]}" >> "${ES_CONFIG_PATH[$i]}" || die + echo "cluster.name: $i" >> "${ES_CONFIG_PATH[$i]}" || die + echo "node.name: $i" >> "${ES_CONFIG_PATH[$i]}" || die + echo 'node.max_local_storage_nodes: 2' >> "${ES_CONFIG_PATH[$i]}" || die + transport=$((${ES_PORT[$i]}+100)) + echo "transport.port: ${transport}" >> "${ES_CONFIG_PATH[$i]}" || die + echo "discovery.seed_hosts: [\"localhost:${transport}\"]" >> "${ES_CONFIG_PATH[$i]}" || die + echo "discovery.type: single-node" >> "${ES_CONFIG_PATH[$i]}" || die + done + + echo 'path.repo: /' >> "${ES_CONFIG_PATH[local]}" || die + echo "reindex.remote.whitelist: localhost:${ES_PORT[remote]}" >> "${ES_CONFIG_PATH[local]}" || die + + # start ES instances + for i in ${ES_INSTANCES}; do + ES_PATH_CONF=${ES_CONFIG_DIR[$i]} "${ES_PATH}/bin/elasticsearch" -d -p "${ES_PID[$i]}" || die + + local j + local es_started=0 + for j in {1..30}; do + grep -q "started" "${ES_LOG[$i]}" 2> /dev/null + if [[ $? -eq 0 ]]; then + einfo "Elasticsearch $i started" + es_started=1 + eend 0 + break + elif grep -q 'BindException\[Address already in use\]' "${ES_LOG[$i]}" 2>/dev/null; then + eend 1 + eerror "Elasticsearch $i already running" + die "Cannot start Elasticsearch $i for tests" + else + einfo "Waiting for Elasticsearch $i" + eend 1 + sleep 2 + continue + fi + done + + [[ $es_started -eq 0 ]] && die "Elasticsearch failed to start" + done + + export TEST_ES_SERVER="localhost:${ES_PORT[local]}" + export REMOTE_ES_SERVER="localhost:${ES_PORT[remote]}" + + # run tests + nosetests -v || die + + for i in ${ES_INSTANCES}; do + pkill -F ${ES_PID[$i]} + done +} + +python_install_all() { + use doc && local HTML_DOCS=( docs/_build/html/. ) + doman docs/_build/man/* + distutils-r1_python_install_all +} + +pkg_postinst() { + ewarn "" + ewarn "For Python 3 support information please read: http://click.pocoo.org/latest/python3/" + ewarn "" + ewarn "Example usage on Python 3:" + ewarn "export LC_ALL=en_US.UTF-8" + ewarn "export LANG=en_US.UTF-8" + ewarn "curator ..." +}