Updating liguros repo

6 files changed, 161 insertions, 0 deletions

diff --git a/dev-python/pykwalify/Manifest b/dev-python/pykwalify/Manifest
new file mode 100644
index 000000000000..feb43bfc373d
--- /dev/null
+++ b/dev-python/pykwalify/Manifest
@@ -0,0 +1 @@
+DIST pykwalify-1.7.0.tar.gz 69402 BLAKE2B ad2ecafad8457509a5517917cd3bbb078a244a9ef96e5560efc4f6b0c4a3939df7f20a9e3e72e43be97edb8af6315d49e2c2f3248aaf17d3c4f0962f60132185 SHA512 d0db48814712dc26eeac8f00ee0751a006c8b00521c9829e3c1a4ecedd6083194e9e28da1ed3c13eaff30d9b5c3dd1dbb499ba8864251400e34c23911110d848
diff --git a/dev-python/pykwalify/files/pykwalify-1.4.0-S.patch b/dev-python/pykwalify/files/pykwalify-1.4.0-S.patch
new file mode 100644
index 000000000000..0f133c9c95c8
--- /dev/null
+++ b/dev-python/pykwalify/files/pykwalify-1.4.0-S.patch
@@ -0,0 +1,24 @@
+ tests/test_core.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/test_core.py b/tests/test_core.py
+index 2fae7bc..0773f88 100644
+--- a/tests/test_core.py
++++ b/tests/test_core.py
+@@ -397,12 +397,12 @@ class TestCore(object):
+         ]
+ 
+         # Add override magic to make it easier to test a specific file
+-        if "S" in os.environ:
+-            pass_tests = [os.environ["S"]]
++        if "_S" in os.environ:
++            pass_tests = [os.environ["_S"]]
+             _fail_tests = []
+-        elif "F" in os.environ:
++        elif "_F" in os.environ:
+             pass_tests = []
+-            _fail_tests = [(os.environ["F"], SchemaError)]
++            _fail_tests = [(os.environ["_F"], SchemaError)]
+ 
+         for passing_test_file in pass_tests:
+             f = self.f(os.path.join("success", passing_test_file))
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/metadata.xml b/dev-python/pykwalify/metadata.xml
new file mode 100644
index 000000000000..cfb79bc678f0
--- /dev/null
+++ b/dev-python/pykwalify/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Grokzen/pykwalify</remote-id>
+		<remote-id type="pypi">pykwalify</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/pykwalify/pykwalify-1.7.0.ebuild b/dev-python/pykwalify/pykwalify-1.7.0.ebuild
new file mode 100644
index 000000000000..1bd14f741442
--- /dev/null
+++ b/dev-python/pykwalify/pykwalify-1.7.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python lib/cli for JSON/YAML schema validation"
+HOMEPAGE="https://pypi.org/project/pykwalify/ https://github.com/Grokzen/pykwalify"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+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}]
+"
+DEPEND="
+	test? (
+		dev-python/testfixtures[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0-S.patch
+	"${FILESDIR}"/${P}-test.patch
+)
diff --git a/dev-python/pykwalify/pykwalify-9999.ebuild b/dev-python/pykwalify/pykwalify-9999.ebuild
new file mode 100644
index 000000000000..8e7d7e6f6bfb
--- /dev/null
+++ b/dev-python/pykwalify/pykwalify-9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Python lib/cli for JSON/YAML schema validation"
+HOMEPAGE="https://pypi.org/project/pykwalify/ https://github.com/Grokzen/pykwalify"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/Grokzen/pykwalify.git"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS=""
+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 )
+
+python_test() {
+	pytest -vv || die
+}