gentoo Easter resync : 12.04.2020

3 files changed, 11 insertions, 55 deletions

diff --git a/dev-python/MechanicalSoup/Manifest b/dev-python/MechanicalSoup/Manifest
index aa12f51c85c5..ac049457a219 100644
--- a/dev-python/MechanicalSoup/Manifest
+++ b/dev-python/MechanicalSoup/Manifest
@@ -1,5 +1,3 @@
-DIST MechanicalSoup-0.10.0.tar.gz 40111 BLAKE2B cbb09253666850d3ce433f60ed6405585588e6dc7198c58de1cab8ecfad1e1c814433787aefe33dbb490edab5367ffca285d14cf8fbcb2c16e309b957a3a311b SHA512 5fa493abac39c5084dacb67b9dfaa2f8f5af773d3e3aaff48e6240596e863ada30a2fd1e345188c3249fd6e570977aa45b9fd553fe5a549f8430f170613bb866
-DIST MechanicalSoup-0.6.0.zip 5286 BLAKE2B 93a1d124cd45820e425fcb50b2aec04026f7a6f42c7c3f5c93103fbd216c98e36f366a1f7f343dd5561688ac4adb6feacab08ae444f91156348c07a80710a306 SHA512 cc413723514f3beee1267c57c16f6de2c19eb1f64535a60b546d289c7c18d8c4ba752ea61ab0b4a2aead2b56b12639cd226cb32662622515cb40262b7e619c24
-EBUILD MechanicalSoup-0.10.0.ebuild 1600 BLAKE2B 36ab0be54a9b1b63e2f7a47cf445def15e2d0a4225d294416f8e58e55e4238b3cf3a98d1b2e0a98e551c9359ab661cfefade2deb1c6b9da7838fd480a823905f SHA512 af16d21b0a75cf6f0387496cfdff1c71343e454f64b662dbd52eeb9f467a4f3b4978428caf02255e65cf22873d26e317afa6903f2b05a2fb49d320dc5928e20a
-EBUILD MechanicalSoup-0.6.0.ebuild 731 BLAKE2B 66928dbcfab0ed4e8edd345fd4698bf2094a450b6b4415c5cddf86547a28af168c618e7eab291bc707dd8d95c9a2935d761431c8fccff3660af66cdc1f1a1ad4 SHA512 b7fcc6a12d62c23b68dc0a13f778c992bc531f6d40d6dc302a609d2d2a89ac22a7358cfae079b58e8550267b98b5fe3bbda6aa331e23e58747ae02887b2b7887
+DIST MechanicalSoup-0.12.0.tar.gz 44505 BLAKE2B 7c303f7ae4dea12157d5c845a4dcdc6923e76d3565debd88d2f43e2cfc29a503feb6accb969839a39b1c4071b029f53908a12902a5c4f175f0383da227224c55 SHA512 6cce80ea5a90e7f19f2b13749f6ee48222d973af66cb350ac867a554580b0d619defe5a93741e6ec8aa808c585a8c01703158c7484521ac069977388de8bb7e3
+EBUILD MechanicalSoup-0.12.0.ebuild 1345 BLAKE2B d0391dd08429611788997d910256a7b6568c59417fb42301f1d6a6de4549aa411e8e1e5bf3c0360e928099fdfda526fd695b550138f45e82caaa7a54b590d035 SHA512 4660c2e2384831f83572a56da1d33536118b8fa6529aab6a53d6efc8e0dd7159dd72c6255ea70af1727c44faa574df1687e623b99caa07974f55ea45a2bb4feb
 MISC metadata.xml 550 BLAKE2B e580cc1c3eea5cd7a96ff564c5bb7606498911f997c326cd962ea54e7c73e6521b08d22a7de40f5a7784f3a6386aaaa6d8146ce64d8bcdc4d5f3f42a1855f821 SHA512 cf6d0689bb22256e261d2b964ec9ad05508467f68a115ded56b73fe27dad9f15f53a202f6c71e36b6219a5e79d99e01befa04bf239637f16ced3658d41d06314
diff --git a/dev-python/MechanicalSoup/MechanicalSoup-0.10.0.ebuild b/dev-python/MechanicalSoup/MechanicalSoup-0.12.0.ebuild
index 58f9c75208d9..14b661fd6590 100644
--- a/dev-python/MechanicalSoup/MechanicalSoup-0.10.0.ebuild
+++ b/dev-python/MechanicalSoup/MechanicalSoup-0.12.0.ebuild
@@ -3,22 +3,19 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 
 inherit distutils-r1
 
 DESCRIPTION="A python library for automating interaction with websites"
 HOMEPAGE="https://pypi.org/project/MechanicalSoup/"
-# https://github.com/MechanicalSoup/MechanicalSoup/pull/217
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-# https://github.com/MechanicalSoup/MechanicalSoup/issues/215
-RESTRICT="test"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/beautifulsoup-4.0[${PYTHON_USEDEP}]
@@ -26,9 +23,7 @@ RDEPEND="
 	>=dev-python/six-1.4[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 "
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+BDEPEND="
 	test? (
 		${RDEPEND}
 		>=dev-python/requests-mock-1.3.0[${PYTHON_USEDEP}]
@@ -38,21 +33,17 @@ DEPEND="
 	)
 "
 
+distutils_enable_sphinx docs
+
 python_prepare_all() {
+	# We don't need pytest-runner to run tests via pytest
 	sed -i "s/'pytest-runner'//" setup.py || die
 	distutils-r1_python_prepare_all
 }
 
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
 python_test() {
 	# Override pytest options to skip coverage and flake8
-	py.test --override-ini="addopts=" \
+	pytest -vv --override-ini="addopts=" \
 		|| die "tests failed with ${EPYTHON}"
 }
 
diff --git a/dev-python/MechanicalSoup/MechanicalSoup-0.6.0.ebuild b/dev-python/MechanicalSoup/MechanicalSoup-0.6.0.ebuild
deleted file mode 100644
index ea60b25ad81a..000000000000
--- a/dev-python/MechanicalSoup/MechanicalSoup-0.6.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/hickford/MechanicalSoup"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="A python library for automating interaction with websites"
-HOMEPAGE="https://pypi.org/project/MechanicalSoup/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/beautifulsoup-4.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"