gentoo Easter resync : 12.04.2020

5 files changed, 10 insertions, 39 deletions

diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index 58add074a1fb..2e1456e52f49 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,7 +1,5 @@
-DIST terminado-0.5.tar.gz 10491 BLAKE2B 8beb4784c13ceeea47966efbf56e62b259adac533d2ff72f287984aa100837d8123be3109761c9c282fc081e26d0d26224a8d1bab6263d3abed00839cc576c9b SHA512 8c53e2c8fa837c171a8790744770f41d4fc8fe15fe8abd28af17317950c615e4c75c22ab896fd98984fd9c2bbbc7798e5ffe319827d84eb77889bca63660e421
-DIST terminado-0.6.tar.gz 10334 BLAKE2B 02ae2135da982cfe12ea0b3219a67a6b327bd3f4f45539f79629cb33ec0882586094b7084e4ca64567f55fbe6f0194a10934c558fd836f825ef81319920caf5f SHA512 9b9521917d4000aa45e61a1b88705e715f11686890671607cca81d4518f1e17feefdc2ad3de64dd0e053a6849956efbbd838c7b98d570dcc98a936c0a4cfce9c
 DIST terminado-0.8.1.tar.gz 21134 BLAKE2B 504fd13ab5efde77b38fbd79e4bbe4b08fb9bc1cf0f4aa8ca6cd90b4dbd20083088d6cc287f78ca159bf5f72a371c146dc0c648e310a0c892f283f2d9fd23199 SHA512 5cf5259954339d567c41b8ef3b4d77de4f69fe41fd371e63775c9d8d5870ee801795462654f16978f4c86e381fcd26437e307458db9ee4e575d31d5377f2a749
-EBUILD terminado-0.5.ebuild 705 BLAKE2B b85d361ac98a1a4235ad618d6b5ec601661dac9eb83dc7cbd20c0adf8103a1e057f42bfc45026b3d3bba1befb47411f9f562730a057fcc98549dac50270e784e SHA512 b7a83e837d0491690b54415736274e1183ffd97a4168806bd8527d81bedd9d662c04f92b5f3bad599ff9676a3bd1dcd69f9c637c850f9925ef5b6b0ba3e1c17a
-EBUILD terminado-0.6.ebuild 717 BLAKE2B 232061f5c3e68173a726ad2357c0c3c4acb2d9d403ebe7ab882ddae42823ecc98b3cb735b86c1dcb74cd5487c0d50329e1983f28045bf405aeef4e981c86420a SHA512 723a1970504d9ee5fdf060a3298589a41159b5ce544649378f2aabb6af26547783775f2a426db25394405987222c2610637d877bf5b652bd41f0d6ef5d82a82c
-EBUILD terminado-0.8.1.ebuild 709 BLAKE2B 17eb0cfb7aba16d4a01badc33d452b3f862007e7c33c741d887e5ce630c301c1a3dc9b5ba5c2c69d44497f48dc4c03f41baf3caed31d57dd600816626b76d1b0 SHA512 412891cca935313c61e17bbb8d3288b600cc70e6c7f91adcc92caa6bf1493840e8fced7e3a7959644c0a0fa79ec5be0d38f6250770c0adf5e5bfd80dd2ae16b6
-MISC metadata.xml 381 BLAKE2B 4daeebe708d2d0a70a215899420ee4e218258279629c0a5d2f11cd00c961900e7fc81706eb443899c4e9f6d25aa204b24718c09f5c0929f5dbb2273c04bc3f99 SHA512 22d6d48e2bed0de91f468bed90ad2f41c164f84cd89eb99e87cb1b0f528a0c79f632cdd4dc5cad919de9fbc166edf539fbeddad06ab9a864b8a46efc023b5fae
+DIST terminado-0.8.3.tar.gz 21165 BLAKE2B ec031cb7828840a4f299aa25de0030d5b7993119fd41b71e698dd032f4fd31ea725a9b610dc53a71d480ee74b49a1d072d76555b434da4f5fee2479efa03fdec SHA512 441355cdc919b6f04b1bf1eb870f24e0bd6c7ef412e72e1747707049b1fa0d6676644e3646007f2653b3df00e1f30048d9dc40d73f0827b2bbfc0821549e140b
+EBUILD terminado-0.8.1.ebuild 708 BLAKE2B 4f33b4de11fe0adb4bf493b397f3c5d037d50a9eb8239c8f1459832df54c3570ebf977d61775949358ba3442449c125b8c1ba5de9e022309aacd44ce587a81e7 SHA512 9ed263651d5291e4853b1bacebd4f9f7f5c0845ae9eb0d962af3fc9fb6f7cefde838e5bccf3ac507c38c679a2ff64ecd74c2c19a396d1834fbd3b0ea998c6dc0
+EBUILD terminado-0.8.3.ebuild 712 BLAKE2B 307561a03fbc3bdd4f94d8ae1e90f568cf91b3892df4685ef2820951c0ba5edbbf2f3278c76ef884e492dd8998807f54caf86116c4d4e388ed2701480e7f8891 SHA512 67e0c14ee3764f149f7fd8b033eb1745af38c6c9840c743b267b798bec06e9b9de944d70bd2dbd25f6f1815cddd2e39a9d5950c26bcc0267587e79ad39180aa9
+MISC metadata.xml 406 BLAKE2B dec60c3428988bbfd3007f2b26d8ecab06a95cbe5c4394e19f063e9dcab48a31d20c6e07d1600ee2249b72fd95d48fc80e9c9c32e44a74f2b2adc9d3fef84742 SHA512 7dc32ac28a0fc70ec0616c821723e1ed3a754da904963eba60e1cd634e955994fbcff05ab7bbc05df2b0beff74aec441349ba0b9566294e9ea387e6928c8d6dc
diff --git a/dev-python/terminado/metadata.xml b/dev-python/terminado/metadata.xml
index 4744584f2da2..1a5cd2cac4d6 100644
--- a/dev-python/terminado/metadata.xml
+++ b/dev-python/terminado/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">terminado</remote-id>
     <remote-id type="github">jupyter/terminado</remote-id>
diff --git a/dev-python/terminado/terminado-0.5.ebuild b/dev-python/terminado/terminado-0.5.ebuild
deleted file mode 100644
index 5977bf86dd4d..000000000000
--- a/dev-python/terminado/terminado-0.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Terminals served to term.js using Tornado websockets"
-HOMEPAGE="https://pypi.org/project/terminado/ https://github.com/jupyter/terminado"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="amd64 arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/ptyprocess[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests --verbosity=3 || die
-}
diff --git a/dev-python/terminado/terminado-0.8.1.ebuild b/dev-python/terminado/terminado-0.8.1.ebuild
index 92889d03629d..ab145799d081 100644
--- a/dev-python/terminado/terminado-0.8.1.ebuild
+++ b/dev-python/terminado/terminado-0.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/terminado/terminado-0.6.ebuild b/dev-python/terminado/terminado-0.8.3.ebuild
index a6a4549f1a3b..ebcd692b13af 100644
--- a/dev-python/terminado/terminado-0.6.ebuild
+++ b/dev-python/terminado/terminado-0.8.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -21,8 +21,8 @@ RDEPEND="
 	dev-python/ptyprocess[${PYTHON_USEDEP}]
 	>=www-servers/tornado-0.4[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 python_test() {
-	nosetests --verbosity=3 || die
+	py.test -v || die
 }