gentoo resync : 28.04.2019

3 files changed, 19 insertions, 15 deletions

diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index de6e18dbd79c..e892cf4bb7f1 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,6 +1,6 @@
 AUX xarray-0.10.8-skip-broken-test.patch 513 BLAKE2B c4d6298732029f509df209679b7d5fa285a9093053a08a1668a7f12e97a9d2d3738b170b05eb0b681c1a631268dc8213124eafa6cbcb9ba8dbfb53d6da0dbd49 SHA512 8b70650a30d0e5ce5d6c88c19515fb176de2151414042ba8a73b340e2cc6bdc1976ec0b4c723b4943178a886d29bae1e192059452c61e8eb2065b39ed18f23c5
 DIST xarray-0.10.8.tar.gz 1630608 BLAKE2B d211918a73c81842b0850ed65daa41015e5ab16da9aebe56b86252aeae16141cf540e22b6ed7c758f6db74ca68c9f81dce0ce65db7d054db6ca9d2b4b62e7b0d SHA512 962650f49690638cda9cd91e2d09209138127dd603a7a1e10407e114ee806f61a33f6e4ffaf63474c2d5ad0ce31717e5cae5e3965179a198c62bef013df252a5
-DIST xarray-0.9.6.tar.gz 1491394 BLAKE2B 42f0e9d8c0c2c4194cab72a309671fc4ebe18feff9d8593291e67ebf26e896a4d142ef4a75e8358ca8425822537949d9d69e970cba568c187696ae88c81cc09a SHA512 f7a12da324e0afadbdcf7abea33d4450189ba4b761240995328a530b67e2f2134b31bf961f8fa388e2296c26dc2da2cf14c113ab86ac301d96b7a35af56a5107
-EBUILD xarray-0.10.8.ebuild 823 BLAKE2B 875f2bcb72caed58030cb4ae19000285a7e805ab6d34f5fff8a1753ffb2ce2e01d0239025e2f95ef8dbd57f2f784282adb33abcd9f92f3714fe4cecb15099c97 SHA512 ed6f788ad9bbb7af6e9b07cc65d82c8f64d9d64f5fee123f50efcc2ae56cf6ae75fa82a005688b450b01ff32b59d00727a7947a812c0636bc1c0cd239fb7fe05
-EBUILD xarray-0.9.6.ebuild 638 BLAKE2B c58617382c00c29c7520c01a99c5f95df96411f86cbd825399e43192f4f186761be7d6494ce3015fadcce69cf06588711333547d93570a14965f8796ea209072 SHA512 c23fc52bbd5bc8eaf198a54bec09042e9445788ed379c5c9a3c64bbb3184369f1abded531ac5023a983119429ef9659b3c39bae4d87bcfb7bac0a23cec669461
+DIST xarray-0.12.1.tar.gz 1745116 BLAKE2B f38380503347a17cfe11e930b5e275912fb4fb3f02de057e61b21ad1515c8f5e2d5c28007ebb20cecda0f4398b7c71ce239fb3d6f25a79600f5da509f0976359 SHA512 f9e8033b9387ec4175c9d65199aff9cdfc442abb9d2736fb47ab6170ab1e1860b4eb693317a64dad560ab6974f08f7c13f24ecf24c087154ae2d71203e584426
+EBUILD xarray-0.10.8.ebuild 821 BLAKE2B f5d4994188396f99a484ee29f1164ffdfd0649b1de58203897b1441e731b813dc2daac3ee48f950fdcaeb253277b584e7727ba1824d3b4553a0d9bebf8816c45 SHA512 7c72cf0d7f14f7c0d6be7817bcb267c8fa991be6c74baeb98a79ba95c4fae98460ce594c803185b40c4cad3f192bf7f00723162684e0198e5bc3e520af1763b3
+EBUILD xarray-0.12.1.ebuild 793 BLAKE2B 5e8832d0ecbfd96eb3c2708bf91ef7b5303c50c47724272fb0de97f1ebebd5aa91621804f959325369de0bd45f1c8e5d7591c32d1ecde106de4aa26636d2b5ed SHA512 968a8b9f525efd640655306a6630bcf4fc979fe8aca5ba876d506af72b953ff8cce1f68fd93e49d2905e7e798eaac1a91d7dfb177fb4856e5a5909d20a6fcf33
 MISC metadata.xml 508 BLAKE2B ec48fcbe3d7ecc1907ba57f065ff83affaf8a449a50d39faed113192bbf1dd60ae145550c4794b0fcc000a20f1701a5e9cebaa01782e294ed5300ed5cd82704d SHA512 937f1589c8b6eaa65f70d7b273e60935eaed889895996e5f952dece64a0982130fa5f50f09f25041a86f88f7646e76ba9ca3580ae8adcefa1f83a4effc5409c3
diff --git a/dev-python/xarray/xarray-0.10.8.ebuild b/dev-python/xarray/xarray-0.10.8.ebuild
index 280a946fa188..7f8209076949 100644
--- a/dev-python/xarray/xarray-0.10.8.ebuild
+++ b/dev-python/xarray/xarray-0.10.8.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/xarray/xarray-0.9.6.ebuild b/dev-python/xarray/xarray-0.12.1.ebuild
index cdab9ad3971b..c6f3b7e7c290 100644
--- a/dev-python/xarray/xarray-0.9.6.ebuild
+++ b/dev-python/xarray/xarray-0.12.1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit distutils-r1
 
@@ -17,15 +16,21 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-"
+	>=dev-python/numpy-1.14[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.19.2[${PYTHON_USEDEP}]"
+
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
+		>=dev-python/dask-0.18.2[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
+		>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
 	)"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.10.8-skip-broken-test.patch"
+)
+
 python_test() {
-	py.test -v || die
+	pytest -v || die
 }