gentoo resync : 25.04.2020

3 files changed, 57 insertions, 12 deletions

diff --git a/dev-python/pykwalify/Manifest b/dev-python/pykwalify/Manifest
index 04e569b21dad..43a1d53572a7 100644
--- a/dev-python/pykwalify/Manifest
+++ b/dev-python/pykwalify/Manifest
@@ -1,5 +1,6 @@
 AUX pykwalify-1.4.0-S.patch 862 BLAKE2B d92c4e8d4d85d28f6df574bfe2f1ab0aa82c32ba8ce2b4a2d6ecdc21fe1db4056351b6aa6dde04d897525ce596ed492781bd7dcf0fba2ca5970a3af79a9abf3b SHA512 f7d9189993cd73a0412ef01fcb01a99fcbc61edc6863a1997333de085294b9c5772d026f7ab8f16703568404f2ff76bb1aeed760d7908c7865e0891ad5752dc9
+AUX pykwalify-1.7.0-test.patch 1873 BLAKE2B a95d46378faa7ef87db078d44fdc5b3121bff303cbdd682907a764b7a142a8813366547731cce54424a1900b9c3ae3184f3b98a1519687063e8cdcf69c953457 SHA512 6b22feff5efbfce01f46791a8676d39839e5e3c5498253dfb2b80ddf7f96d3f83978cbd7378c15bdf9a9a69b4143a5643e034156d66d134dd962dde6de7b8023
 DIST pykwalify-1.7.0.tar.gz 69402 BLAKE2B ad2ecafad8457509a5517917cd3bbb078a244a9ef96e5560efc4f6b0c4a3939df7f20a9e3e72e43be97edb8af6315d49e2c2f3248aaf17d3c4f0962f60132185 SHA512 d0db48814712dc26eeac8f00ee0751a006c8b00521c9829e3c1a4ecedd6083194e9e28da1ed3c13eaff30d9b5c3dd1dbb499ba8864251400e34c23911110d848
-EBUILD pykwalify-1.7.0.ebuild 916 BLAKE2B dd88f1b8333c744882d95f0be29d07e90b15210adbdd1a7770e1abf9041cdcdae0d4a695853f738d73502c018927e17721aa88f52d682cec58493366ee94c875 SHA512 216b1fdc10acd80a3956aaee3b922a1563926a16f059397fe05ee9b96e7f8793141526e21b273ac78e892f36e4a0d9bb8938d0bdb8c8639dd91d7146c853b312
+EBUILD pykwalify-1.7.0.ebuild 804 BLAKE2B 0daa8d0b24f01cb511ee8f554e322e72af2c5a221e296951a26e4c42760251899e4b17bb1d3b404d07e802e41f7e8735571f76e08a733e1549ced415429f8c65 SHA512 0967f99de317e2af6653717c3cc675b9f979bbf4682f71f9295e8a85f79ea3c976ec94e03a7a80883983478e8866b5307efef51a8c0a70667995d92a110ac0de
 EBUILD pykwalify-9999.ebuild 904 BLAKE2B 1ce13b42c7ffb139fdb8e280f24f0a6cee25d092d361f5cde11ae6b3bb049103dc5905dfb96da49b39105fc543c2c263c55e5ba47de7e257479f0bb1c610d8e8 SHA512 acad7084d3a4302d1a75d03f3c985551fb8c067453a3c147e644c4b8e5175457e193f34c8b23d031abdcf0a9432628a0bdbe6b4c665fddb83cba468d7ea0d3bc
 MISC metadata.xml 369 BLAKE2B 8c31d9164a8a1c9210a56c2f7f7a604f2fa2bd4bd7de3047420074af8a19a63f12ec18f4d5c436aa28533ea9d7e15307ab99c114cb8a0aeea419ec1d185ea7f0 SHA512 a99ea380231e9e3537bc693c2bb1ffa6bc250ec086f88bfa19a7c7a8df04d21be8dad752535f8e89eee4fa989b79c38e998946a44dbd9bae64def2cd2e858913
diff --git a/dev-python/pykwalify/files/pykwalify-1.7.0-test.patch b/dev-python/pykwalify/files/pykwalify-1.7.0-test.patch
new file mode 100644
index 000000000000..a41653abae1b
--- /dev/null
+++ b/dev-python/pykwalify/files/pykwalify-1.7.0-test.patch
@@ -0,0 +1,48 @@
+From 744816a146e567a4c1efd30e874ff76134754fe2 Mon Sep 17 00:00:00 2001
+From: Grokzen <Grokzen@gmail.com>
+Date: Wed, 9 Oct 2019 23:25:59 +0200
+Subject: [PATCH] Fix broken test where errors data was wrong and duplicated
+
+---
+ tests/files/fail/test_type_float.yaml | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/tests/files/fail/test_type_float.yaml b/tests/files/fail/test_type_float.yaml
+index bef14b8..972167d 100644
+--- a/tests/files/fail/test_type_float.yaml
++++ b/tests/files/fail/test_type_float.yaml
+@@ -16,8 +16,6 @@ schema:
+   type: seq
+   seq:
+     - type: float
+-errors:
+-  - "Value 'foo' is not of type 'float'. Path: '/0'"
+ errors:
+   - "Value 'True' is not of type 'float'. Path: '/1'"
+   - "Value 'foo' is not of type 'float'. Path: '/0'"
+
+From 49052dd010637e1403c8b2b1c3710926acd2b1a0 Mon Sep 17 00:00:00 2001
+From: Grokzen <Grokzen@gmail.com>
+Date: Wed, 9 Oct 2019 23:21:09 +0200
+Subject: [PATCH] Fixed bug in test_multi_file_support where pytest would raise
+ issue with a option that is no longer supported
+
+---
+ tests/test_core.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tests/test_core.py b/tests/test_core.py
+index 6fcd81e..bd974df 100644
+--- a/tests/test_core.py
++++ b/tests/test_core.py
+@@ -336,7 +336,9 @@ def test_multi_file_support(self):
+             compare(c.root_rule.schema_str, passing_test[2], prefix="Parsed rules is not correct, something have changed...")
+ 
+         for failing_test in failing_tests:
+-            with pytest.raises(failing_test[2], message="Test files: {0} : {1}".format(", ".join(failing_test[0]), failing_test[1])):
++            print("Test files: {0} : {1}".format(", ".join(failing_test[0]), failing_test[1]))
++
++            with pytest.raises(failing_test[2]):
+                 c = Core(schema_files=failing_test[0], source_file=failing_test[1])
+                 c.validate()
+ 
diff --git a/dev-python/pykwalify/pykwalify-1.7.0.ebuild b/dev-python/pykwalify/pykwalify-1.7.0.ebuild
index c7744c23108c..1bd14f741442 100644
--- a/dev-python/pykwalify/pykwalify-1.7.0.ebuild
+++ b/dev-python/pykwalify/pykwalify-1.7.0.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -14,26 +15,21 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/docopt-0.6.2[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 "
 DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/testfixtures[${PYTHON_USEDEP}]
 	)
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-1.4.0-S.patch )
+distutils_enable_tests pytest
 
-python_test() {
-	pytest -vv || die
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0-S.patch
+	"${FILESDIR}"/${P}-test.patch
+)