* [gentoo-commits] repo/gentoo:master commit in: dev-python/pykwalify/, dev-python/pykwalify/files/
@ 2015-08-27 15:36 Justin Lecher
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher @ 2015-08-27 15:36 UTC (permalink / raw
To: gentoo-commits
commit: 3f9734ef19af6060db4288dc32a2935d8a54686c
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 15:35:56 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 15:36:05 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f9734ef
dev-python/pykwalify: New package, ebuild written by me
Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
dev-python/pykwalify/Manifest | 1 +
dev-python/pykwalify/files/pykwalify-1.4.0-S.patch | 24 ++++++++++++++
dev-python/pykwalify/metadata.xml | 8 +++++
dev-python/pykwalify/pykwalify-1.4.0.ebuild | 37 +++++++++++++++++++++
dev-python/pykwalify/pykwalify-9999.ebuild | 38 ++++++++++++++++++++++
5 files changed, 108 insertions(+)
diff --git a/dev-python/pykwalify/Manifest b/dev-python/pykwalify/Manifest
new file mode 100644
index 0000000..5369578
--- /dev/null
+++ b/dev-python/pykwalify/Manifest
@@ -0,0 +1 @@
+DIST pykwalify-1.4.0.tar.gz 23126 SHA256 25ab7c4303ca4631dd89de851535d1284a8799c7b696ddbf95056f0b615f4520 SHA512 072f646a9846122e74fb09b682abaf89b93ded52b9e32053586658a4a5a416bc51d051b1607358450324ceb963e3cd66ae487421275cc7928facdb2acede2797 WHIRLPOOL 826cd36b5f1061a60c2056d532671cca5865462805e5c6f6c9b83e149d9775f9a2ffb559d5ea8dd18986eb7dffe36710cc776e022c2d0b36fc51a1045e52b4a0
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 0000000..0f133c9
--- /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/metadata.xml b/dev-python/pykwalify/metadata.xml
new file mode 100644
index 0000000..c166166
--- /dev/null
+++ b/dev-python/pykwalify/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>jlec@gentoo.org</email>
+ <name>Justin Lecher</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-python/pykwalify/pykwalify-1.4.0.ebuild b/dev-python/pykwalify/pykwalify-1.4.0.ebuild
new file mode 100644
index 0000000..23ae49c
--- /dev/null
+++ b/dev-python/pykwalify/pykwalify-1.4.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python lib/cli for JSON/YAML schema validation"
+HOMEPAGE="https://pypi.python.org/pypi/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"
+IUSE="test"
+
+RDEPEND="
+ >=dev-python/docopt-0.6.2
+ >=dev-python/pyyaml-3.11
+ >=dev-python/python-dateutil-2.4.2
+"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/testfixtures[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-S.patch )
+
+python_test() {
+ py.test || die
+}
diff --git a/dev-python/pykwalify/pykwalify-9999.ebuild b/dev-python/pykwalify/pykwalify-9999.ebuild
new file mode 100644
index 0000000..7732db7
--- /dev/null
+++ b/dev-python/pykwalify/pykwalify-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Python lib/cli for JSON/YAML schema validation"
+HOMEPAGE="https://pypi.python.org/pypi/pykwalify https://github.com/Grokzen/pykwalify"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/Grokzen/pykwalify.git"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS=""
+IUSE="test"
+
+RDEPEND="
+ >=dev-python/docopt-0.6.2
+ >=dev-python/pyyaml-3.11
+ >=dev-python/python-dateutil-2.4.2
+"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/testfixtures[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.4.0-S.patch )
+
+python_test() {
+ py.test || die
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pykwalify/, dev-python/pykwalify/files/
@ 2020-04-23 7:28 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2020-04-23 7:28 UTC (permalink / raw
To: gentoo-commits
commit: 370797b0043b0cc3f75b353ff738af0e75c68f2b
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 23 07:15:38 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Apr 23 07:28:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=370797b0
dev-python/pykwalify: Fix tests, modernize, py3.8
Thanks to Marek Szuba for pointing out the patches.
Closes: https://bugs.gentoo.org/718938
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../pykwalify/files/pykwalify-1.7.0-test.patch | 48 ++++++++++++++++++++++
dev-python/pykwalify/pykwalify-1.7.0.ebuild | 18 ++++----
2 files changed, 55 insertions(+), 11 deletions(-)
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 00000000000..a41653abae1
--- /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 c7744c23108..1bd14f74144 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
+)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pykwalify/, dev-python/pykwalify/files/
@ 2021-03-02 9:00 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2021-03-02 9:00 UTC (permalink / raw
To: gentoo-commits
commit: 3b0fdf224361ec4a01f47753631921cb3f456569
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 2 08:57:46 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Mar 2 08:57:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b0fdf22
dev-python/pykwalify: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pykwalify/Manifest | 1 -
.../pykwalify/files/pykwalify-1.7.0-test.patch | 48 ----------------------
dev-python/pykwalify/pykwalify-1.7.0.ebuild | 35 ----------------
3 files changed, 84 deletions(-)
diff --git a/dev-python/pykwalify/Manifest b/dev-python/pykwalify/Manifest
index 80b7b12f0f9..d7d091a8b14 100644
--- a/dev-python/pykwalify/Manifest
+++ b/dev-python/pykwalify/Manifest
@@ -1,2 +1 @@
-DIST pykwalify-1.7.0.tar.gz 69402 BLAKE2B ad2ecafad8457509a5517917cd3bbb078a244a9ef96e5560efc4f6b0c4a3939df7f20a9e3e72e43be97edb8af6315d49e2c2f3248aaf17d3c4f0962f60132185 SHA512 d0db48814712dc26eeac8f00ee0751a006c8b00521c9829e3c1a4ecedd6083194e9e28da1ed3c13eaff30d9b5c3dd1dbb499ba8864251400e34c23911110d848
DIST pykwalify-1.8.0.tar.gz 62462 BLAKE2B 1593f5e3e15188929574ece60bf6818438258bf024d105ae26323a97a202ac69001a15ca6daaa430970af3659c49da745bcf1f77c23ac72bed2ddca14440d943 SHA512 c77d3072995bb3f61336e725227eeece1dafe2182513e5f67eedeeca3437825b53ac691a991055aad8298db252e2012bc9a61c23d766335fcfbb10a3b587b45d
diff --git a/dev-python/pykwalify/files/pykwalify-1.7.0-test.patch b/dev-python/pykwalify/files/pykwalify-1.7.0-test.patch
deleted file mode 100644
index a41653abae1..00000000000
--- a/dev-python/pykwalify/files/pykwalify-1.7.0-test.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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
deleted file mode 100644
index fba6ffb6482..00000000000
--- a/dev-python/pykwalify/pykwalify-1.7.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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_{7..9} )
-
-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
-)
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-02 9:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-02 9:00 [gentoo-commits] repo/gentoo:master commit in: dev-python/pykwalify/, dev-python/pykwalify/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2020-04-23 7:28 Michał Górny
2015-08-27 15:36 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox