gentoo resync : 21.06.2020

4 files changed, 238 insertions, 42 deletions

diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index 5314998664bb..b5160d037c34 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -2,8 +2,10 @@ AUX pandas-0.24.2-skip-broken-test.patch 644 BLAKE2B 8a879cb0cf3f9b2e7c80a649fe3
 DIST pandas-0.24.2.tar.gz 11837693 BLAKE2B 3762e94554a3ae3c803c9a412c5c551c15a9fbf15cb05633f7d1b0ccbfddc646f68f0306666e688a83a4495b0537cea2fec671157f5a63aaa5f9cad6b791261e SHA512 0795c6bb8a47a511853558ea59d371b4540ec175f213cfba4ad2361d6481fea5d3f7074bb4961c32f2f0080a72d7436a9b3706f5cc692074f98d83bfc587fd15
 DIST pandas-1.0.1.tar.gz 4852368 BLAKE2B d6d3ae757d245b665e4b67bd237c090ddff97688934268b171e278a14d2439f5d993addc304f16a0ac9ab7bc34bfe36df807f998148106b062c567a5a7f14f4a SHA512 6755d17a4a4a8c3770f413199a12b3c4d6b5f5fcc925bec9b9b0f813fcd020df0b2c0a32dc8528c795b16556e00c078a03e4a6746192b44bfbd7ffc809c1e56c
 DIST pandas-1.0.4.tar.gz 5040267 BLAKE2B 2855b1708e1ae4c56b6118613ec644d010a3af7db474bb30aec3cf84e497371af03b63a2168f6daf0fc42da07274f8724734117c6aaea34f49eeafbf6ac73b9f SHA512 01ef73cab3db067ca4a29992d71aa637425b8d70473fde6ccfb359dfedc9546315c6d37d74f3825c924cab789c2536ec69db071a303cfc5e1a7897b253dd9467
+DIST pandas-1.0.5.tar.gz 5007108 BLAKE2B 6aff9602f8b1642af1dca70c7c596f2978bfef8ca9bc782d55aeeab85d3768289849ccd0150291c33cab3442d38cedada91fb846abaade1b3905098edb06c06e SHA512 bb9e3ed9988f7b878ac6f9d7c6c054b119acfc4b960ae42ea92436979ef2098289123cac32b176753942a1edb3b6bd35c4eaf05112a25fbf8a89078fd76a2646
 EBUILD pandas-0.24.2.ebuild 5376 BLAKE2B 9277f27158afa9b9989d89190d04a67165d6452fb8a83964c85582b6d984726499fb2d10aa684194d5414500e04d86fd3307a0b74330d35848952d2c6c780a84 SHA512 b2577e30bb76a8b86d3ed062acf3978ff885c355428b677a0cb66cdfb80de84a81eb6126753a94b642e608b19990589518acb7aa2ce7209ff5e04bbdd05748b2
 EBUILD pandas-1.0.1.ebuild 5375 BLAKE2B 558b287f3d7f754bb15fb691de2170805fee29358b50d7248953b99fd4bf83d01afec9d382015f10e549a561bd34b87225fcbab8c2fcdf035c312cc1515e584a SHA512 edcf506b007633a4676e49c29f6446dd9753a1362998a1b8ac05831b912af3a3e7effe9a1163e17d126e1565d777ddeafd3f66e9c467f150efbbe9c08dc1ed64
-EBUILD pandas-1.0.4.ebuild 5375 BLAKE2B 558b287f3d7f754bb15fb691de2170805fee29358b50d7248953b99fd4bf83d01afec9d382015f10e549a561bd34b87225fcbab8c2fcdf035c312cc1515e584a SHA512 edcf506b007633a4676e49c29f6446dd9753a1362998a1b8ac05831b912af3a3e7effe9a1163e17d126e1565d777ddeafd3f66e9c467f150efbbe9c08dc1ed64
-EBUILD pandas-9999.ebuild 5663 BLAKE2B 1b4c3889527930dd52d1a8a688b484acc524b318d6bd5b4b0c6cfceceeeb0b1b87b48476b5da8464e01c0d67cbcee93fe4b2aacb6679d1909d566bc8acc20bb5 SHA512 16ff9d6e6c0516ac468b23d4aa4b8e2b487b6404271a78b76bd8705df078d0d66e04a20dad1d65cda62d31ee5ec1965949202188c2450ebda45788896ad2bdbe
+EBUILD pandas-1.0.4.ebuild 5705 BLAKE2B 02eb621b6a2e4ab3808cf2adc986fed43840ffc56526853a2ed6ea0cbb4440ea601956acc47c8066af8b9f67f533071d889e578a2a9f8de86f3c9c38d2d75d19 SHA512 929e4b1ff58cac671b7a7c7c200f4c546ef950def90b67ae14f838054d4a40b8ae0f32cf00798306f47bda70f6a55f6b9225862a892d7f1041876e2eb3693cd4
+EBUILD pandas-1.0.5.ebuild 5705 BLAKE2B 02eb621b6a2e4ab3808cf2adc986fed43840ffc56526853a2ed6ea0cbb4440ea601956acc47c8066af8b9f67f533071d889e578a2a9f8de86f3c9c38d2d75d19 SHA512 929e4b1ff58cac671b7a7c7c200f4c546ef950def90b67ae14f838054d4a40b8ae0f32cf00798306f47bda70f6a55f6b9225862a892d7f1041876e2eb3693cd4
+EBUILD pandas-9999.ebuild 5689 BLAKE2B 4bb1564c464ab25e04e6de09de01a3c60981697537b53533bf81a3bf057fe89950b3ecf87eebe55affb194e2658d2067a73b69aa0e5fd522e737466c32812374 SHA512 f2153d607503e1d6fb6a7b658ef250e95a83d0c0176b82612fc7338af3c83e8ee7441538f36c7963c33fd2b5d793462b4902d1642e6d38c8e6babaac984ae8af
 MISC metadata.xml 834 BLAKE2B b075b9c90c4f1be265117df2c47ace4c86dad3fec9945b5a483a11048211348ee10e433f378610de4a9b599031914b32992b9fad693b832cf0266b0f171b3e38 SHA512 85ad67a653f4ced5fb9331b778fb2906c253874cf8e522f1b67547ef8e2f49e084e84d9e055aee7e2a57c6e6e4e7f7791a4ce299fac7c74dd6448a94977e8f5e
diff --git a/dev-python/pandas/pandas-1.0.4.ebuild b/dev-python/pandas/pandas-1.0.4.ebuild
index c2bd75a1183a..979f4b8e0adf 100644
--- a/dev-python/pandas/pandas-1.0.4.ebuild
+++ b/dev-python/pandas/pandas-1.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="threads(+)"
 
 VIRTUALX_REQUIRED="manual"
@@ -14,6 +14,7 @@ inherit distutils-r1 eutils flag-o-matic virtualx
 DESCRIPTION="Powerful data structures for data analysis and statistics"
 HOMEPAGE="https://pandas.pydata.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_/}.tar.gz"
+S="${WORKDIR}/${P/_/}"
 
 SLOT="0"
 LICENSE="BSD"
@@ -43,8 +44,10 @@ OPTIONAL_DEPEND="
 	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
 	dev-python/s3fs[${PYTHON_USEDEP}]
 	dev-python/statsmodels[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
+	' python3_{6,7})
 	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
-	>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
 	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
 	dev-python/xlwt[${PYTHON_USEDEP}]
 	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
@@ -63,7 +66,7 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.29.20-r1[${PYTHON_USEDEP}]
 	doc? (
 		${VIRTUALX_DEPEND}
 		app-text/pandoc
@@ -106,13 +109,15 @@ RDEPEND="${COMMON_DEPEND}
 	full-support? ( ${OPTIONAL_DEPEND} )
 "
 
-S="${WORKDIR}/${P/_/}"
-
 python_prepare_all() {
 	# Prevent un-needed download during build
 	sed -e "/^              'sphinx.ext.intersphinx',/d" \
 		-i doc/source/conf.py || die
 
+	# requires package installed
+	sed -e 's:test_register_entrypoint:_&:' \
+		-i pandas/tests/plotting/test_backend.py || die
+
 	distutils-r1_python_prepare_all
 }
 
@@ -126,13 +131,19 @@ python_compile_all() {
 	fi
 }
 
+src_test() {
+	virtx distutils-r1_src_test
+}
+
 python_test() {
-	pushd  "${BUILD_DIR}"/lib > /dev/null
+	local -x LC_ALL=C.UTF-8
+	pushd  "${BUILD_DIR}"/lib > /dev/null || die
 	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
-	PYTHONPATH=. virtx pytest pandas -v --skip-slow --skip-network \
-		-m "not single"
-	find . -name .pytest_cache -exec rm -r {} + || die
-	popd > /dev/null
+	PYTHONPATH=. pytest pandas -v --skip-slow --skip-network \
+		-m "not single" || die "Tests failed with ${EPYTHON}"
+	find . '(' -name .pytest_cache -o -name .hypothesis ')' \
+		-exec rm -r {} + || die
+	popd > /dev/null || die
 }
 
 python_install_all() {
diff --git a/dev-python/pandas/pandas-1.0.5.ebuild b/dev-python/pandas/pandas-1.0.5.ebuild
new file mode 100644
index 000000000000..979f4b8e0adf
--- /dev/null
+++ b/dev-python/pandas/pandas-1.0.5.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+VIRTUALX_REQUIRED="manual"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 eutils flag-o-matic virtualx
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="https://pandas.pydata.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_/}.tar.gz"
+S="${WORKDIR}/${P/_/}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc full-support minimal test X"
+RESTRICT="!test? ( test )"
+
+RECOMMENDED_DEPEND="
+	>=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]
+"
+
+# TODO: add pandas-gbq to the tree
+OPTIONAL_DEPEND="
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/blosc[${PYTHON_USEDEP}]
+	|| (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	|| (
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${PYTHON_USEDEP}]
+	)
+	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
+	dev-python/s3fs[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
+	' python3_{6,7})
+	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
+	dev-python/xlwt[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+	X? (
+		|| (
+			dev-python/PyQt5[${PYTHON_USEDEP}]
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+"
+COMMON_DEPEND="
+	>dev-python/numpy-1.13.1[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.29.20-r1[${PYTHON_USEDEP}]
+	doc? (
+		${VIRTUALX_DEPEND}
+		app-text/pandoc
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/nbsphinx[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xlrd[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+		x11-misc/xclip
+	)
+	test? (
+		${VIRTUALX_DEPEND}
+		${RECOMMENDED_DEPEND}
+		${OPTIONAL_DEPEND}
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pymysql[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		x11-misc/xclip
+		x11-misc/xsel
+	)
+"
+# dev-python/statsmodels invokes a circular dep
+#  hence rm from doc? ( ), again
+RDEPEND="${COMMON_DEPEND}
+	!minimal? ( ${RECOMMENDED_DEPEND} )
+	full-support? ( ${OPTIONAL_DEPEND} )
+"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/^              'sphinx.ext.intersphinx',/d" \
+		-i doc/source/conf.py || die
+
+	# requires package installed
+	sed -e 's:test_register_entrypoint:_&:' \
+		-i pandas/tests/plotting/test_backend.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# To build docs the need be located in $BUILD_DIR,
+	# else PYTHONPATH points to unusable modules.
+	if use doc; then
+		cd "${BUILD_DIR}"/lib || die
+		cp -ar "${S}"/doc . && cd doc || die
+		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local -x LC_ALL=C.UTF-8
+	pushd  "${BUILD_DIR}"/lib > /dev/null || die
+	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
+	PYTHONPATH=. pytest pandas -v --skip-slow --skip-network \
+		-m "not single" || die "Tests failed with ${EPYTHON}"
+	find . '(' -name .pytest_cache -o -name .hypothesis ')' \
+		-exec rm -r {} + || die
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
+		einfo "An initial build of docs is absent of references to statsmodels"
+		einfo "due to circular dependency. To have them included, emerge"
+		einfo "statsmodels next and re-emerge pandas with USE doc"
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
+	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
+	optfeature "for msgpack compression using blosc" dev-python/blosc
+	optfeature "necessary for Amazon S3 access" dev-python/s3fs
+	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
+	optfeature "Plotting support" dev-python/matplotlib
+	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
+	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
+	optfeature "R I/O support" dev-python/rpy
+	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
+	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
+	optfeature "miscellaneous statistical functions" sci-libs/scipy
+	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
+}
diff --git a/dev-python/pandas/pandas-9999.ebuild b/dev-python/pandas/pandas-9999.ebuild
index e597cacdc2c8..5b361c58bd82 100644
--- a/dev-python/pandas/pandas-9999.ebuild
+++ b/dev-python/pandas/pandas-9999.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="threads(+)"
 
 VIRTUALX_REQUIRED="manual"
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 eutils flag-o-matic git-r3 virtualx
 
@@ -22,49 +23,50 @@ IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
 RECOMMENDED_DEPEND="
-	dev-python/bottleneck[${PYTHON_USEDEP}]
+	>=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}]
 	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]
 "
+
+# TODO: add pandas-gbq to the tree
 OPTIONAL_DEPEND="
 	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
 	dev-python/blosc[${PYTHON_USEDEP}]
-	dev-python/boto[${PYTHON_USEDEP}]
 	|| (
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 	)
-	dev-python/httplib2[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
 	|| (
-		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		dev-python/openpyxl[${PYTHON_USEDEP}]
 		dev-python/xlsxwriter[${PYTHON_USEDEP}]
 	)
 	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
-	dev-python/rpy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/statsmodels[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/s3fs[${PYTHON_USEDEP}]
+		dev-python/statsmodels[${PYTHON_USEDEP}]
+		>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
+	' python3_{6,7})
 	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
-	dev-python/xarray[${PYTHON_USEDEP}]
-	dev-python/xlrd[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
 	dev-python/xlwt[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
 	X? (
-		dev-python/PyQt5[${PYTHON_USEDEP}]
 		|| (
+			dev-python/PyQt5[${PYTHON_USEDEP}]
 			x11-misc/xclip
 			x11-misc/xsel
 		)
 	)
 "
 COMMON_DEPEND="
-	>dev-python/numpy-1.7[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
+	>dev-python/numpy-1.13.1[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 "
 DEPEND="${COMMON_DEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cython-0.23[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.29.20-r1[${PYTHON_USEDEP}]
 	doc? (
 		${VIRTUALX_DEPEND}
 		app-text/pandoc
@@ -74,11 +76,12 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
 		dev-python/nbsphinx[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.1[${PYTHON_USEDEP}]
 		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
 		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/rpy[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/xlrd[${PYTHON_USEDEP}]
 		dev-python/xlwt[${PYTHON_USEDEP}]
 		sci-libs/scipy[${PYTHON_USEDEP}]
@@ -89,8 +92,11 @@ DEPEND="${COMMON_DEPEND}
 		${RECOMMENDED_DEPEND}
 		${OPTIONAL_DEPEND}
 		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/pymysql[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		dev-python/psycopg:2[${PYTHON_USEDEP}]
 		x11-misc/xclip
 		x11-misc/xsel
@@ -99,8 +105,6 @@ DEPEND="${COMMON_DEPEND}
 # dev-python/statsmodels invokes a circular dep
 #  hence rm from doc? ( ), again
 RDEPEND="${COMMON_DEPEND}
-	!<dev-python/numexpr-2.1[${PYTHON_USEDEP}]
-	!~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]
 	!minimal? ( ${RECOMMENDED_DEPEND} )
 	full-support? ( ${OPTIONAL_DEPEND} )
 "
@@ -110,9 +114,9 @@ python_prepare_all() {
 	sed -e "/^              'sphinx.ext.intersphinx',/d" \
 		-i doc/source/conf.py || die
 
-	# https://github.com/pydata/pandas/issues/11299
-	sed -e 's:testOdArray:disable:g' \
-		-i pandas/tests/io/json/test_ujson.py || die
+	# requires package installed
+	sed -e 's:test_register_entrypoint:_&:' \
+		-i pandas/tests/plotting/test_backend.py || die
 
 	distutils-r1_python_prepare_all
 }
@@ -127,14 +131,19 @@ python_compile_all() {
 	fi
 }
 
+src_test() {
+	virtx distutils-r1_src_test
+}
+
 python_test() {
-	local test_pandas='not network and not disabled'
-	[[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow'
-	pushd  "${BUILD_DIR}"/lib > /dev/null
+	local -x LC_ALL=C.UTF-8
+	pushd  "${BUILD_DIR}"/lib > /dev/null || die
 	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
-	PYTHONPATH=. MPLCONFIGDIR=. \
-		virtx nosetests --verbosity=3 -A "${test_pandas}" pandas
-	popd > /dev/null
+	PYTHONPATH=. pytest pandas -v --skip-slow --skip-network \
+		-m "not single" || die "Tests failed with ${EPYTHON}"
+	find . '(' -name .pytest_cache -o -name .hypothesis ')' \
+		-exec rm -r {} + || die
+	popd > /dev/null || die
 }
 
 python_install_all() {
@@ -153,8 +162,7 @@ pkg_postinst() {
 	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
 	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
 	optfeature "for msgpack compression using blosc" dev-python/blosc
-	optfeature "necessary for Amazon S3 access" dev-python/boto
-	optfeature "needed for pandas.io.gbq" dev-python/httplib2 dev-python/setuptools dev-python/python-gflags ">=dev-python/google-api-python-client-1.2.0"
+	optfeature "necessary for Amazon S3 access" dev-python/s3fs
 	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
 	optfeature "Plotting support" dev-python/matplotlib
 	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt