From: Michał Górny <mgorny@gentoo.org>
Date: Fri, 27 Mar 2020 08:31:00 +0000 (+0100)
Subject: dev-python/elasticsearch-py: Remove redundant versions
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e4808a958bad62fc6eeda68c4b7c95d54e405bb9;p=gentoo.git

dev-python/elasticsearch-py: Remove redundant versions

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---

diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index 18c488219765..160fbeae2cbd 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -1,8 +1,4 @@
-DIST elasticsearch-oss-6.4.0.tar.gz 33727061 BLAKE2B dd0ff95bb124103ca340b480c5192c9919ef226d4c3ef1b61accd0df2ee9b60a8215693b3db0fa327a4d6791de66746654144a9172210687e8a2efa9f6f4dde3 SHA512 0197dcf24bdb81cbcfa492d899363528816143962abd1925a5092e8177c25e8ca490afe5868b41057b3cded296f59f38ed11ba0156a820b6c877c69a5888846c
 DIST elasticsearch-oss-7.0.1-no-jdk-linux-x86_64.tar.gz 68787752 BLAKE2B 63864deae4e0545a2cd1924c4e2f4c0bb61134fe9649037f23c10123efe0425d376183035171a952a10f1804196a97287c59b508e97dff5e9e05063a67ede020 SHA512 301e552b221369cca8365ee64d8b52b5e8abea0e26159f7a6e77a1722fb1107641fe2472138869f5156bbbf43c74e62ffb22d0c35062190505f7504e3f571e16
 DIST elasticsearch-oss-7.5.2-no-jdk-linux-x86_64.tar.gz 68711865 BLAKE2B 01a456d3965c83fe2a94e87b0f19dfbc89666f01fade36cff1b7733b24c91580bc95b9e0acf0d9134078715be890bfacdc6c0091cf56dfb9dc43e71bf387806c SHA512 ea494dfb743e5ea12dbbc269d8103fa08644c580291eb88b25000743d272aa87c8709ac9fb2939ad387d5d335f0795c943114b8471074bba7d583494bbc6d100
-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.5.tar.gz 110079 BLAKE2B 89f5f7434fae0c4d20c1780c0979a419278fcaa23f75d5241d48c695905e566742fac5651387f0b1cb665ab6e9cb299406ee7f0157facc8c4cf2c1f1a4a3e5d7 SHA512 c4224cee6f7739ad932036f2afc6ed20ead16829d42f40b79e08d6714b4a247f019175739fb5a93bcea5bba391bd9f54cadcd31d42ff9411da414d08c140049b
-DIST elasticsearch-py-7.1.0.tar.gz 110917 BLAKE2B 774db2356b8f75e2b4d739d2c51db22db63326ec6a51c9ee29481d86848b7bb28aaff6e2a43377e7fb2584677417a39d107704391edba350982025859032e54f SHA512 af6dc6f200190e57d37d5c771da6cf9b3cbeee8f4bbffbe0b9466fe88496b9c45d44ef40c2d5379e4fa9cc54ce61c46b35a578e3ae99b82afeacd132bf2c6ad6
 DIST elasticsearch-py-7.5.1.tar.gz 116602 BLAKE2B b9ae9cc7496e911d102118a6e2684e8942dfc0f4e92d3cd9cf6429c7c7a48521ed5b61174ddc4fbcf8001c30e74fe11649e5ef13e90ca32307290ae0bb8d0f6c SHA512 9a82715031fbe60e5d795ca31cd7ba3fa653b3100e8d1b53e0088c55ad3ed7f4c4309a07327d41d1ca1abe2fdbb9f4b6e97d6ab39ae5dcde46b7c2b1642a92b2
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-6.3.1-r1.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-6.3.1-r1.ebuild
deleted file mode 100644
index 6ad7d0907f0d..000000000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-6.3.1-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-ES_VERSION="6.4.0"
-
-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}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples doc test"
-
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-RESTRICT="test"
-
-RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretty-yaml[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		virtual/jre:1.8 )"
-
-python_compile_all() {
-	emake -C docs -j1 man $(usex doc html "")
-}
-
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25124"
-	ES_INSTANCE="gentoo-es-py-test"
-	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
-	PID="${ES}/elasticsearch.pid"
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
-		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
-		"${ES}/config/elasticsearch.yml" || die
-
-	# start local instance of elasticsearch
-	"${ES}"/bin/elasticsearch -d -p "${PID}" -Epath.repo=/ || die
-
-	local i
-	local 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"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
-
-	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die
-
-	pkill -F ${PID}
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && dodoc -r example
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-6.4.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-6.4.0.ebuild
deleted file mode 100644
index e080218c68ad..000000000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-6.4.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-ES_VERSION="6.4.0"
-
-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/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-${ES_VERSION}.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-python/requests-3.0.0[${PYTHON_USEDEP}]
-	dev-python/nose[${PYTHON_USEDEP}]
-	dev-python/coverage[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	dev-python/nosexcover[${PYTHON_USEDEP}]
-	virtual/jre:1.8 )"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]"
-
-python_compile_all() {
-	emake -C docs -j1 man $(usex doc html "")
-}
-
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25124"
-	ES_INSTANCE="gentoo-es-py-test"
-	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
-	PID="${ES}/elasticsearch.pid"
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
-		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
-		"${ES}/config/elasticsearch.yml" || die
-
-	# start local instance of elasticsearch
-	"${ES}"/bin/elasticsearch -d -p "${PID}" -Epath.repo=/ || die
-
-	local i
-	local 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"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
-
-	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || 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
-}
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-7.1.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-7.1.0.ebuild
deleted file mode 100644
index ee86457c79fd..000000000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-7.1.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-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-python/requests-3.0.0[${PYTHON_USEDEP}]
-	dev-python/nose[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	virtual/jre:* )"
-
-BDEPEND=">=dev-python/sphinx-1.3.1-r1"
-
-python_prepare_all() {
-	sed -e '/coverage/d' \
-		-e '/nosexcover/d' \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	emake -C docs -j1 man $(usex doc html "")
-}
-
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
-python_test() {
-	local es="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	local es_port="25124"
-	local es_instance="gentoo-es-py-test"
-	local es_log="${es}/logs/${es_instance}.log"
-	local pid="${es}/elasticsearch.pid"
-	export JAVA_HOME=$(java-config -g JAVA_HOME || die)
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/#http.port: 9200/http.port: ${es_port}/g; \
-		s/#cluster.name: my-application/cluster.name: ${es_instance}/g" \
-		"${es}/config/elasticsearch.yml" || die
-
-	# start local instance of elasticsearch
-	"${es}"/bin/elasticsearch -d -p "${pid}" -Epath.repo=/ || die
-
-	local i
-	local 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"
-			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
-}