Updating liguros repo

5 files changed, 33 insertions, 96 deletions

diff --git a/dev-python/oct2py/Manifest b/dev-python/oct2py/Manifest
index 7a1bc9521718..2c0627be5fd8 100644
--- a/dev-python/oct2py/Manifest
+++ b/dev-python/oct2py/Manifest
@@ -1,5 +1 @@
-DIST oct2py-3.6.0.tar.gz 668836 BLAKE2B 2edafd7c054a70a604273a7f3f5846926cb54dd05e7f2625aad57034d7760c099e9ad01120b719d3d047e6e6aa11f16e5fe8ca58e51079f038cea6d7aa3efe13 SHA512 f414a0231665bc3bedb7dcdaab8c86f32c140e5107ef80b70e2f99467e737d033de6ff492f2af7233671bff9b148475e0af4881c073ac727d0fd1228b7cf59b6
-DIST oct2py-4.0.6.tar.gz 431738 BLAKE2B d76fd323fa2405cd70dd1d4cbbdf64bbd346d45dc8065de0913d44d833f6d609d20ec8887cefeafdc4e59c382f862a8954b395557ff5ec127a67b1df2d560083 SHA512 997ca843571d2d68c4c57c0213a525c1be5f8b3e3dbffffb6cd41e423d68c8836dd12a03d5210d7f0cbf8ff19be7bb9d25b48c62a236cae68a0762547e574caa
-EBUILD oct2py-3.6.0-r1.ebuild 1429 BLAKE2B 0702ac34c1b1ad5008733da125443f541f7aee9d8bf3e4f90c6bcb8ca201df4b5059c9232132279116cfe6e3fc611162859685ba9a68ea13998ba1d667ef6035 SHA512 867e53f7a3e3733fae47d4f8b9372ad0cd050ccb5178149ed7ef40d68fd2cb3f410b6c62a06bad1407a5c5528224bb10046bb93a63ffe81525ac2ad859574774
-EBUILD oct2py-4.0.6-r1.ebuild 1206 BLAKE2B 61a0e214902bef45baededd2860344a1db85621fb40cc37fd8475038889818dc4367dcafefde2456c24ba659f3b020944907e47c1a0c5615fc0bb69bac2e245c SHA512 b9605db4ec4c843f52645a15d30d1e4311b763980db6ffa1e0b3050798b6ef14b18bdd4cfcab473af55458badeb455d9e173bb00b6d2fc5ec6e53184d0be5650
-MISC metadata.xml 615 BLAKE2B 32a95461360131faf43212d3e419ba75a12f853749baf7f862499155d6f445492c311860ea5ee7c7e22c5e9586c722df8382cfe2eb6f67ac7bc1596f6cb9602a SHA512 e476f193cbbdefdf56caeb8a8a501f57daf1b74a12a32c426b6e9150ea0d5b2538b7bd9bbeb3b7f45ba01aa741be2fd0b4dbf8e8302e867230fc1b2512c10ca2
+DIST oct2py-5.2.0.tar.gz 436128 BLAKE2B 674bd034a44aa9cdb5fd4258c96665fda1b1d79a13ae9fa8d36d168e39385a978ed75bf8748ecdd53f57720785ea8e6c5ffd85d81f3b3c307a748fbc8d328a86 SHA512 55c2ee68b4fd73a8901fa2f7f67fefde5fa37d5070434aee03bfa2a746ff5179f51ccb96541a112e416438eb912caa81e040a5a1cbcbfac36b0285d496ac96fd
diff --git a/dev-python/oct2py/files/oct2py-5.2.0-mask-pkg-load-test.patch b/dev-python/oct2py/files/oct2py-5.2.0-mask-pkg-load-test.patch
new file mode 100644
index 000000000000..c233b45ec2c7
--- /dev/null
+++ b/dev-python/oct2py/files/oct2py-5.2.0-mask-pkg-load-test.patch
@@ -0,0 +1,10 @@
+--- a/oct2py/tests/test_usage.py
++++ b/oct2py/tests/test_usage.py
+@@ -338,6 +338,7 @@
+         with pytest.raises(Oct2PyError, match=exp):

+             self.oc.pyeval_like_error3(1)

+ 

++    @pytest.mark.skip(reason="requires octave 'signal' package to be installed")

+     def test_pkg_load(self):

+         self.oc.eval('pkg load signal')

+         t = np.linspace(0, 1, num=100)

diff --git a/dev-python/oct2py/metadata.xml b/dev-python/oct2py/metadata.xml
index 2e11e143d9ee..8323799b38b8 100644
--- a/dev-python/oct2py/metadata.xml
+++ b/dev-python/oct2py/metadata.xml
@@ -14,5 +14,5 @@
     <remote-id type="pypi">oct2py</remote-id>
     <remote-id type="github">blink1073/oct2py</remote-id>
   </upstream>
-	<origin>calculatelinux-overlay</origin>
+	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/oct2py/oct2py-3.6.0-r1.ebuild b/dev-python/oct2py/oct2py-3.6.0-r1.ebuild
deleted file mode 100644
index 50e2c751a734..000000000000
--- a/dev-python/oct2py/oct2py-3.6.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python to GNU Octave bridge"
-HOMEPAGE="
-	https://github.com/blink1073/oct2py
-	https://blink1073.github.io/oct2py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.12[${PYTHON_USEDEP}]
-	>=sci-mathematics/octave-4.2.0"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# https://github.com/blink1073/oct2py/issues/77
-	sed \
-		-e 's:test_help:disabled:g' \
-		-i oct2py/tests/test_usage.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs html || die
-	fi
-}
-
-python_test() {
-	unset DISPLAY
-	[[ ${EPYTHON} == python2.7 ]] && local OPTIONS="--with-doctest"
-	nosetests --exe -v oct2py ${OPTIONS} || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( html/. )
-	if use examples; then
-		docinto examples
-		dodoc -r example/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oct2py/oct2py-4.0.6-r1.ebuild b/dev-python/oct2py/oct2py-5.2.0-r1.ebuild
index 2355a1bb6cf8..0d1e1756ba91 100644
--- a/dev-python/oct2py/oct2py-4.0.6-r1.ebuild
+++ b/dev-python/oct2py/oct2py-5.2.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8,9,10} )
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
 inherit distutils-r1
 
@@ -16,39 +16,35 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
+IUSE="examples"
 
 RDEPEND="
-	>=dev-python/numpy-1.11[${PYTHON_USEDEP}]
-	dev-python/octave_kernel[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.17[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
-	)
+	>=dev-python/numpy-1.12[${PYTHON_USEDEP}]
+	>=dev-python/octave_kernel-0.31.0[${PYTHON_USEDEP}]
+	>=dev-python/scipy-0.17[${PYTHON_USEDEP}]"
+BDEPEND="
 	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/ipython[${PYTHON_USEDEP}]
-	)
-"
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs html || die
-		HTML_DOCS=( html/. )
-	fi
-}
+		dev-python/pandas[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/numpydoc dev-python/sphinx-bootstrap-theme dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+PATCHES=( "${FILESDIR}"/${PN}-5.2.0-mask-pkg-load-test.patch )
 
 python_test() {
-	cd "${BUILD_DIR}/lib" || die
-	py.test -v -v || die
+	cd "${BUILD_DIR}"/lib || die
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+
+	# remove cache which breaks python_install()
+	rm -r .pytest_cache || die
 }
 
 python_install_all() {
 	distutils-r1_python_install_all
+
 	if use examples; then
 		docinto examples
 		dodoc -r example/.