From 08a7441156d863b22c323daf618aab5fd9a12f4b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 26 Apr 2020 13:43:32 +0200 Subject: [PATCH] dev-python/sqlalchemy-rqlite: Enable py3.{7,8}, modernize MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- .../sqlalchemy-rqlite-1.0.ebuild | 24 +++++++------------ .../sqlalchemy-rqlite-9999.ebuild | 24 +++++++------------ 2 files changed, 16 insertions(+), 32 deletions(-) diff --git a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.0.ebuild b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.0.ebuild index 6a9c5db39ea2..be1c7ec77701 100644 --- a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.0.ebuild +++ b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.0.ebuild @@ -1,8 +1,10 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python3_6 ) +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{6,7,8} ) inherit distutils-r1 @@ -18,24 +20,14 @@ SRC_URI="${EGIT_REPO_URI%.git}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] +RDEPEND=" dev-python/pyrqlite[${PYTHON_USEDEP}] - dev-python/sqlalchemy[${PYTHON_USEDEP}] - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-cov[${PYTHON_USEDEP}] - dev-python/pylint[${PYTHON_USEDEP}] - )" + dev-python/sqlalchemy[${PYTHON_USEDEP}]" + +distutils_enable_tests pytest src_prepare() { sed -e "s:^__version__ = .*:__version__ = '${PV}':" -i src/sqlalchemy_rqlite/constants.py || die distutils-r1_src_prepare } - -python_test() { - esetup.py test || die "tests failed" - esetup.py lint -f text -E || die "pylint failed" -} diff --git a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.ebuild b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.ebuild index 8e6f85629134..76e6ab45fc94 100644 --- a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.ebuild +++ b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.ebuild @@ -1,8 +1,10 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python3_6 ) +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{6,7,8} ) inherit distutils-r1 @@ -17,24 +19,14 @@ HOMEPAGE="https://github.com/rqlite/sqlalchemy-rqlite" LICENSE="MIT" SLOT="0" KEYWORDS="" -IUSE="test" -RESTRICT="!test? ( test )" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] +RDEPEND=" dev-python/pyrqlite[${PYTHON_USEDEP}] - dev-python/sqlalchemy[${PYTHON_USEDEP}] - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-cov[${PYTHON_USEDEP}] - dev-python/pylint[${PYTHON_USEDEP}] - )" + dev-python/sqlalchemy[${PYTHON_USEDEP}]" + +distutils_enable_tests pytest src_prepare() { sed -e "s:^__version__ = .*:__version__ = '${PV}':" -i src/sqlalchemy_rqlite/constants.py || die distutils-r1_src_prepare } - -python_test() { - esetup.py test || die "tests failed" - esetup.py lint -f text -E || die "pylint failed" -} -- 2.26.2