[gentoo-commits] repo/proj/guru:dev commit in: dev-python/daiquiri/
commit: 7801ffbb7eee99ccfbe26c856150564c404e72c7 Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Fri Dec 13 19:14:15 2024 + Commit: Anna Vyalkova sysrq in> CommitDate: Fri Dec 13 19:14:15 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7801ffbb dev-python/daiquiri: add 3.3.0 Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> dev-python/daiquiri/Manifest | 1 + dev-python/daiquiri/daiquiri-3.3.0.ebuild | 29 + 2 files changed, 30 insertions(+) diff --git a/dev-python/daiquiri/Manifest b/dev-python/daiquiri/Manifest index bc3a90ff6..be5816ce9 100644 --- a/dev-python/daiquiri/Manifest +++ b/dev-python/daiquiri/Manifest @@ -1 +1,2 @@ DIST daiquiri-3.2.3.tar.gz 19582 BLAKE2B 105ba4b80a405bcf0d64fcde585ab0cad4ab939d7d7048dba87f8f022d5bcf8e1708554459dba550765e2110e8987a4e26992d5c53db46b320a942b467d9b44e SHA512 a801e04f67340ed047322bdc65be97a463d268f26dd44615d7a4f17ca3de7c36bb244f6bd54e33c1c2055667f0b4086d98bcbf6778bc4eb99c08a657d6abd7b6 +DIST daiquiri-3.3.0.tar.gz 19473 BLAKE2B ff4b08ab4e920d1df9d3e1d59be0f85ab3f249a9916b74638ad63694080ba63dbd2fc611a8eb99f8ddc9da44b753d3f4325e2ba9c7e706bdbad18d3909e9f4bf SHA512 44abcbeeba72bea8b18541ed695eb0f62bcfdbe03456e34f38df536c9842988de52631fe72d5310daa03eb73b3cbb6efc428b972d4662559ab9650db1662b853 diff --git a/dev-python/daiquiri/daiquiri-3.3.0.ebuild b/dev-python/daiquiri/daiquiri-3.3.0.ebuild new file mode 100644 index 0..f9e3df7c8 --- /dev/null +++ b/dev-python/daiquiri/daiquiri-3.3.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} pypy3 ) +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 optfeature pypi + +DESCRIPTION="Library to configure Python logging easily" +HOMEPAGE=" + https://pypi.org/project/daiquiri/ + https://github.com/Mergifyio/daiquiri +" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=">=dev-python/python-json-logger-3[${PYTHON_USEDEP}]" +BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]" + +distutils_enable_tests pytest + +distutils_enable_sphinx doc/source + +pkg_postinst() { + optfeature "journald support" dev-python/python-systemd +}
[gentoo-commits] repo/proj/guru:dev commit in: dev-python/daiquiri/
commit: ad9fc7a7d48f4d860a3f034efb120de87ea607bc Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Tue Oct 29 21:51:26 2024 + Commit: Anna Vyalkova sysrq in> CommitDate: Tue Oct 29 21:51:26 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ad9fc7a7 dev-python/daiquiri: enable py3.13 Closes: https://bugs.gentoo.org/937359 Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> dev-python/daiquiri/daiquiri-3.2.3.ebuild | 15 ++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dev-python/daiquiri/daiquiri-3.2.3.ebuild b/dev-python/daiquiri/daiquiri-3.2.3.ebuild index c2df3bdf6..8ec7e8a5f 100644 --- a/dev-python/daiquiri/daiquiri-3.2.3.ebuild +++ b/dev-python/daiquiri/daiquiri-3.2.3.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} pypy3 ) +PYTHON_COMPAT=( python3_{10..13} pypy3 ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 optfeature pypi @@ -24,6 +24,19 @@ distutils_enable_tests pytest distutils_enable_sphinx doc/source +python_test() { + if [[ ${EPYTHON} =~ python3.1[23] ]]; then + # Broken by Gentoo patches for python-json-logger + local EPYTEST_DESELECT=( + daiquiri/tests/test_daiquiri.py::TestDaiquiri::test_setup_json_formatter + daiquiri/tests/test_daiquiri.py::TestDaiquiri::test_setup_json_formatter_with_extras + daiquiri/tests/test_output.py::TestOutput::test_datadog + ) + fi + + distutils-r1_python_test +} + pkg_postinst() { optfeature "journald support" dev-python/python-systemd }
[gentoo-commits] repo/proj/guru:dev commit in: dev-python/daiquiri/
commit: d73ff1e8e08af21419075a857ce2408fe10cbb1e Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Mon Oct 7 00:26:22 2024 + Commit: Anna Vyalkova sysrq in> CommitDate: Mon Oct 7 00:26:22 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d73ff1e8 dev-python/daiquiri: add myself as a maintainer Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> dev-python/daiquiri/metadata.xml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dev-python/daiquiri/metadata.xml b/dev-python/daiquiri/metadata.xml index 7251a0c50..b99531aba 100644 --- a/dev-python/daiquiri/metadata.xml +++ b/dev-python/daiquiri/metadata.xml @@ -1,7 +1,10 @@ https://www.gentoo.org/dtd/metadata.dtd";> - + + cyber+gen...@sysrq.in + Anna + The daiquiri library provides an easy way to configure logging. It also provides some custom formatters and handlers.
[gentoo-commits] repo/proj/guru:dev commit in: dev-python/daiquiri/
commit: 23a48a5e81fd7ceb21fedcd29394c9e711a7d538 Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Wed Jan 24 19:33:45 2024 + Commit: Anna Vyalkova sysrq in> CommitDate: Wed Jan 24 19:33:45 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=23a48a5e dev-python/daiquiri: drop 3.0.1 Closes: https://bugs.gentoo.org/921794 Closes: https://bugs.gentoo.org/815607 Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> dev-python/daiquiri/Manifest | 1 - dev-python/daiquiri/daiquiri-3.0.1.ebuild | 28 2 files changed, 29 deletions(-) diff --git a/dev-python/daiquiri/Manifest b/dev-python/daiquiri/Manifest index 6172e061e5..bc3a90ff62 100644 --- a/dev-python/daiquiri/Manifest +++ b/dev-python/daiquiri/Manifest @@ -1,2 +1 @@ -DIST daiquiri-3.0.1.tar.gz 17948 BLAKE2B 1865d1e6b7ad0a1c9b8390992255726a3383034fd631cd217cb2ac820106efaeced3e44168f14d4b8c851e0c17a5d980aeb28a3d3ea3399701af2ea1c248b9c0 SHA512 4c786a744a8ed89147bb77c8825d8733ca88bf1d1877058c87257c92a7ae3b343a0820e9d83f4ac8a2a1b9b74d33f72bb5b306703b3bd57b51cf7931041c5d6c DIST daiquiri-3.2.3.tar.gz 19582 BLAKE2B 105ba4b80a405bcf0d64fcde585ab0cad4ab939d7d7048dba87f8f022d5bcf8e1708554459dba550765e2110e8987a4e26992d5c53db46b320a942b467d9b44e SHA512 a801e04f67340ed047322bdc65be97a463d268f26dd44615d7a4f17ca3de7c36bb244f6bd54e33c1c2055667f0b4086d98bcbf6778bc4eb99c08a657d6abd7b6 diff --git a/dev-python/daiquiri/daiquiri-3.0.1.ebuild b/dev-python/daiquiri/daiquiri-3.0.1.ebuild deleted file mode 100644 index 36c96adb07..00 --- a/dev-python/daiquiri/daiquiri-3.0.1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_10 pypy3 ) - -inherit distutils-r1 pypi - -DESCRIPTION="Python library to easily setup basic logging functionality" -HOMEPAGE=" - https://pypi.org/project/daiquiri/ - https://github.com/jd/daiquiri -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - dev-python/python-json-logger[${PYTHON_USEDEP}] -" -DEPEND=" - ${RDEPEND} - dev-python/setuptools-scm[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest
[gentoo-commits] repo/proj/guru:dev commit in: dev-python/daiquiri/
commit: d0104de662d9abfc3233746c64786cc4f6974cc8 Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Wed Jan 24 19:32:29 2024 + Commit: Anna Vyalkova sysrq in> CommitDate: Wed Jan 24 19:32:29 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d0104de6 dev-python/daiquiri: add 3.2.3 Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> dev-python/daiquiri/Manifest | 1 + dev-python/daiquiri/daiquiri-3.2.3.ebuild | 29 + dev-python/daiquiri/metadata.xml | 6 +- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dev-python/daiquiri/Manifest b/dev-python/daiquiri/Manifest index 6a12a3d94f..6172e061e5 100644 --- a/dev-python/daiquiri/Manifest +++ b/dev-python/daiquiri/Manifest @@ -1 +1,2 @@ DIST daiquiri-3.0.1.tar.gz 17948 BLAKE2B 1865d1e6b7ad0a1c9b8390992255726a3383034fd631cd217cb2ac820106efaeced3e44168f14d4b8c851e0c17a5d980aeb28a3d3ea3399701af2ea1c248b9c0 SHA512 4c786a744a8ed89147bb77c8825d8733ca88bf1d1877058c87257c92a7ae3b343a0820e9d83f4ac8a2a1b9b74d33f72bb5b306703b3bd57b51cf7931041c5d6c +DIST daiquiri-3.2.3.tar.gz 19582 BLAKE2B 105ba4b80a405bcf0d64fcde585ab0cad4ab939d7d7048dba87f8f022d5bcf8e1708554459dba550765e2110e8987a4e26992d5c53db46b320a942b467d9b44e SHA512 a801e04f67340ed047322bdc65be97a463d268f26dd44615d7a4f17ca3de7c36bb244f6bd54e33c1c2055667f0b4086d98bcbf6778bc4eb99c08a657d6abd7b6 diff --git a/dev-python/daiquiri/daiquiri-3.2.3.ebuild b/dev-python/daiquiri/daiquiri-3.2.3.ebuild new file mode 100644 index 00..c2df3bdf60 --- /dev/null +++ b/dev-python/daiquiri/daiquiri-3.2.3.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} pypy3 ) +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 optfeature pypi + +DESCRIPTION="Library to configure Python logging easily" +HOMEPAGE=" + https://pypi.org/project/daiquiri/ + https://github.com/Mergifyio/daiquiri +" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="dev-python/python-json-logger[${PYTHON_USEDEP}]" +BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]" + +distutils_enable_tests pytest + +distutils_enable_sphinx doc/source + +pkg_postinst() { + optfeature "journald support" dev-python/python-systemd +} diff --git a/dev-python/daiquiri/metadata.xml b/dev-python/daiquiri/metadata.xml index a943aa9d77..aaa3dbd626 100644 --- a/dev-python/daiquiri/metadata.xml +++ b/dev-python/daiquiri/metadata.xml @@ -1,4 +1,4 @@ - + https://www.gentoo.org/dtd/metadata.dtd";> @@ -11,5 +11,9 @@ The daiquiri library provides an easy way to configure logging. It also provides jd/daiquiri daiquiri + + Julien Danjou + jul...@danjou.info +
[gentoo-commits] repo/proj/guru:dev commit in: dev-python/daiquiri/
commit: d1d4b55f9ac4513d2aa437f9baa7c43d4dfe5dc7 Author: Alessandro Barbieri gmail com> AuthorDate: Sat Oct 9 02:42:14 2021 + Commit: Alessandro Barbieri gmail com> CommitDate: Sat Oct 9 02:50:06 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d1d4b55f dev-python/daiquiri: enable py3.10, py3.9, pypy3 Signed-off-by: Alessandro Barbieri gmail.com> dev-python/daiquiri/daiquiri-3.0.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/daiquiri/daiquiri-3.0.1.ebuild b/dev-python/daiquiri/daiquiri-3.0.1.ebuild index f2e683390..9300fd7d0 100644 --- a/dev-python/daiquiri/daiquiri-3.0.1.ebuild +++ b/dev-python/daiquiri/daiquiri-3.0.1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_8 ) +PYTHON_COMPAT=( python3_{8..10} pypy3 ) inherit distutils-r1
[gentoo-commits] repo/proj/guru:dev commit in: dev-python/daiquiri/files/
commit: 769b96c1ae9acb6e012823009f21b124b9fb693f Author: Alessandro Barbieri gmail com> AuthorDate: Sun Sep 26 18:42:23 2021 + Commit: Alessandro Barbieri gmail com> CommitDate: Sun Sep 26 18:42:23 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=769b96c1 dev-python/daiquiri/files: remove wrong patches Signed-off-by: Alessandro Barbieri gmail.com> .../testrepository-0.0.20-test-backport.patch | 62 -- .../testrepository-0.0.20-test-backport1.patch | 16 -- .../testrepository-0.0.20-test-backport2.patch | 49 - 3 files changed, 127 deletions(-) diff --git a/dev-python/daiquiri/files/testrepository-0.0.20-test-backport.patch b/dev-python/daiquiri/files/testrepository-0.0.20-test-backport.patch deleted file mode 100644 index d7ab87c06..0 --- a/dev-python/daiquiri/files/testrepository-0.0.20-test-backport.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 8f8ab15fafdad6db850c84772323b32375b09285 Mon Sep 17 00:00:00 2001 -From: Robert Collins -Date: Tue, 10 Mar 2015 15:21:49 +1300 -Subject: [PATCH] Fixup tests with latest testtools. - -Testtools has started chunking exceptions (which is perhaps good, -perhaps bad) - but we shouldn't depend on the exact behaviour in it -for our tests. a/NEWS -+++ b/NEWS -@@ -5,6 +5,12 @@ testrepository release notes - NEXT (In development) - + - -+CHANGES -+--- -+ -+* Isolate the testrepository test suite from the chunking (or otherwise) -+ behaviour of testtools' exception handlers. (Robert Collins) -+ - 0.0.20 - ++ - a/testrepository/tests/test_repository.py -+++ b/testrepository/tests/test_repository.py -@@ -28,6 +28,7 @@ - from testresources import TestResource - from testtools import ( - clone_test_with_new_id, -+content, - PlaceHolder, - ) - import testtools -@@ -103,19 +104,24 @@ class Case(ResourcedTestCase): - def passing(self): - pass - --def failing(self): --self.fail("oops") -- - def unexpected_success(self): - self.expectFailure("unexpected success", self.assertTrue, True) - - -+class FailingCase: -+ -+def run(self, result): -+result.startTest(self) -+result.addError( -+self, None, details={'traceback': content.text_content("")}) -+result.stopTest(self) -+ - def make_test(id, should_pass): - """Make a test.""" - if should_pass: - case = Case("passing") - else: --case = Case("failing") -+case = FailingCase() - return clone_test_with_new_id(case, id) - - diff --git a/dev-python/daiquiri/files/testrepository-0.0.20-test-backport1.patch b/dev-python/daiquiri/files/testrepository-0.0.20-test-backport1.patch deleted file mode 100644 index 655d2c3e7..0 --- a/dev-python/daiquiri/files/testrepository-0.0.20-test-backport1.patch +++ /dev/null @@ -1,16 +0,0 @@ -From d3d6cac4fd42f2067c0dd81be748853f81c348fc Mon Sep 17 00:00:00 2001 -From: Robert Collins -Date: Sun, 12 Jul 2015 21:37:34 +1200 -Subject: [PATCH] Fix 3.3+ tests with nested classnames. - a/testrepository/tests/ui/test_cli.py -+++ b/testrepository/tests/ui/test_cli.py -@@ -157,7 +157,7 @@ def method(self): - self.assertThat(ui._stdout.buffer.getvalue().decode('utf8'), - DocTestMatches("""\ - == --FAIL: testrepository.tests.ui.test_cli.Case.method -+FAIL: testrepository.tests.ui.test_cli...Case.method - -- - ...Traceback (most recent call last):... - File "...test_cli.py", line ..., in method diff --git a/dev-python/daiquiri/files/testrepository-0.0.20-test-backport2.patch b/dev-python/daiquiri/files/testrepository-0.0.20-test-backport2.patch deleted file mode 100644 index 69d591c2f..0 --- a/dev-python/daiquiri/files/testrepository-0.0.20-test-backport2.patch +++ /dev/null @@ -1,49 +0,0 @@ -From e2f84ae6b2bcf89221613056d0c45dd308f46d62 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= -Date: Thu, 5 Apr 2018 01:02:40 +0100 -Subject: [PATCH] Fix the testrepository tests with newer versions of - testtools. - a/testrepository/tests/commands/test_failing.py -+++ b/testrepository/tests/commands/test_failing.py -@@ -90,7 +90,7 @@ class TestCommand(ResourcedTestCase): - finally: - log.stopTestRun() - self.assertEqual( --log._events, [ -+[tuple(ev) for ev in log._events], [ - ('startTestRun',), - ('status', 'failing', 'inprogress', None, True, None, None, False, - None, None, Wildcard), a/testrepository/tests/test_repository.py -+++ b/testrepository/tests/test_repository.py -@@ -113,9 +113,10 @@ class FailingCase: - def run(self, result): - result.startTest(self) - result.addError( --self, None, details={'traceback
[gentoo-commits] repo/proj/guru:dev commit in: dev-python/daiquiri/files/, dev-python/daiquiri/
commit: f814ef2c9cbd119c27a2cf3889c84612bc7765d2 Author: Alessandro Barbieri gmail com> AuthorDate: Sun Sep 26 17:25:49 2021 + Commit: Alessandro Barbieri gmail com> CommitDate: Sun Sep 26 18:37:08 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f814ef2c dev-python/daiquiri: initial import Signed-off-by: Alessandro Barbieri gmail.com> dev-python/daiquiri/Manifest | 1 + dev-python/daiquiri/daiquiri-3.0.1.ebuild | 29 ++ .../testrepository-0.0.20-test-backport.patch | 62 ++ .../testrepository-0.0.20-test-backport1.patch | 16 ++ .../testrepository-0.0.20-test-backport2.patch | 49 + dev-python/daiquiri/metadata.xml | 15 ++ 6 files changed, 172 insertions(+) diff --git a/dev-python/daiquiri/Manifest b/dev-python/daiquiri/Manifest new file mode 100644 index 0..6a12a3d94 --- /dev/null +++ b/dev-python/daiquiri/Manifest @@ -0,0 +1 @@ +DIST daiquiri-3.0.1.tar.gz 17948 BLAKE2B 1865d1e6b7ad0a1c9b8390992255726a3383034fd631cd217cb2ac820106efaeced3e44168f14d4b8c851e0c17a5d980aeb28a3d3ea3399701af2ea1c248b9c0 SHA512 4c786a744a8ed89147bb77c8825d8733ca88bf1d1877058c87257c92a7ae3b343a0820e9d83f4ac8a2a1b9b74d33f72bb5b306703b3bd57b51cf7931041c5d6c diff --git a/dev-python/daiquiri/daiquiri-3.0.1.ebuild b/dev-python/daiquiri/daiquiri-3.0.1.ebuild new file mode 100644 index 0..f2e683390 --- /dev/null +++ b/dev-python/daiquiri/daiquiri-3.0.1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_8 ) + +inherit distutils-r1 + +DESCRIPTION="Python library to easily setup basic logging functionality" +HOMEPAGE=" + https://pypi.org/project/daiquiri + https://github.com/jd/daiquiri +" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + dev-python/python-json-logger[${PYTHON_USEDEP}] +" +DEPEND=" + ${RDEPEND} + dev-python/setuptools_scm[${PYTHON_USEDEP}] +" + +distutils_enable_tests pytest diff --git a/dev-python/daiquiri/files/testrepository-0.0.20-test-backport.patch b/dev-python/daiquiri/files/testrepository-0.0.20-test-backport.patch new file mode 100644 index 0..d7ab87c06 --- /dev/null +++ b/dev-python/daiquiri/files/testrepository-0.0.20-test-backport.patch @@ -0,0 +1,62 @@ +From 8f8ab15fafdad6db850c84772323b32375b09285 Mon Sep 17 00:00:00 2001 +From: Robert Collins +Date: Tue, 10 Mar 2015 15:21:49 +1300 +Subject: [PATCH] Fixup tests with latest testtools. + +Testtools has started chunking exceptions (which is perhaps good, +perhaps bad) - but we shouldn't depend on the exact behaviour in it +for our tests. +--- a/NEWS b/NEWS +@@ -5,6 +5,12 @@ testrepository release notes + NEXT (In development) + + + ++CHANGES ++--- ++ ++* Isolate the testrepository test suite from the chunking (or otherwise) ++ behaviour of testtools' exception handlers. (Robert Collins) ++ + 0.0.20 + ++ + +--- a/testrepository/tests/test_repository.py b/testrepository/tests/test_repository.py +@@ -28,6 +28,7 @@ + from testresources import TestResource + from testtools import ( + clone_test_with_new_id, ++content, + PlaceHolder, + ) + import testtools +@@ -103,19 +104,24 @@ class Case(ResourcedTestCase): + def passing(self): + pass + +-def failing(self): +-self.fail("oops") +- + def unexpected_success(self): + self.expectFailure("unexpected success", self.assertTrue, True) + + ++class FailingCase: ++ ++def run(self, result): ++result.startTest(self) ++result.addError( ++self, None, details={'traceback': content.text_content("")}) ++result.stopTest(self) ++ + def make_test(id, should_pass): + """Make a test.""" + if should_pass: + case = Case("passing") + else: +-case = Case("failing") ++case = FailingCase() + return clone_test_with_new_id(case, id) + + diff --git a/dev-python/daiquiri/files/testrepository-0.0.20-test-backport1.patch b/dev-python/daiquiri/files/testrepository-0.0.20-test-backport1.patch new file mode 100644 index 0..655d2c3e7 --- /dev/null +++ b/dev-python/daiquiri/files/testrepository-0.0.20-test-backport1.patch @@ -0,0 +1,16 @@ +From d3d6cac4fd42f2067c0dd81be748853f81c348fc Mon Sep 17 00:00:00 2001 +From: Robert Collins +Date: Sun, 12 Jul 2015 21:37:34 +1200 +Subject: [PATCH] Fix 3.3+ tests with nested classnames. + +--- a/testrepository/tests/ui/test_cli.py b/testrepository/tests/ui/test_cli.py +@@ -157,7 +157,7 @@ def method(self): + self.assertThat(ui._stdout.buffer.getvalue().decode('utf8'), + DocTestMatches("""\ + == +-FAIL: testrepository.tests.ui.