| 1 |
commit: fffd8606988d3eebc7324f6353d01469c18cfe81 |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 14 13:30:43 2021 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 15 15:43:56 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fffd8606 |
| 7 |
|
| 8 |
www-client/qutebrowser: backport pyyaml-6.0 test fix |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/22571 |
| 11 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/qutebrowser-2.3.1-pyyaml60.patch | 19 +++++++++++++++++++ |
| 14 |
www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild | 4 ++++ |
| 15 |
2 files changed, 23 insertions(+) |
| 16 |
|
| 17 |
diff --git a/www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch b/www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..d585109b9f2 |
| 20 |
--- /dev/null |
| 21 |
+++ b/www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch |
| 22 |
@@ -0,0 +1,19 @@ |
| 23 |
+https://github.com/qutebrowser/qutebrowser/commit/1547a48 |
| 24 |
+From: Florian Bruhin <me@××××××××××××.org> |
| 25 |
+Date: Thu, 14 Oct 2021 09:05:07 +0200 |
| 26 |
+Subject: [PATCH] tests: Adjust for PyYAML 6.0 |
| 27 |
+--- a/tests/unit/utils/test_utils.py |
| 28 |
++++ b/tests/unit/utils/test_utils.py |
| 29 |
+@@ -809,8 +809,11 @@ def test_load(self): |
| 30 |
+ assert utils.yaml_load("[1, 2]") == [1, 2] |
| 31 |
+ |
| 32 |
+ def test_load_float_bug(self): |
| 33 |
+- with pytest.raises(yaml.YAMLError): |
| 34 |
++ try: |
| 35 |
+ utils.yaml_load("._") |
| 36 |
++ except yaml.YAMLError: |
| 37 |
++ # Either no exception or YAMLError, not ValueError |
| 38 |
++ pass |
| 39 |
+ |
| 40 |
+ def test_load_file(self, tmp_path): |
| 41 |
+ tmpfile = tmp_path / 'foo.yml' |
| 42 |
|
| 43 |
diff --git a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild |
| 44 |
index f196542337c..3a90e9763a2 100644 |
| 45 |
--- a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild |
| 46 |
+++ b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild |
| 47 |
@@ -58,6 +58,10 @@ BDEPEND=" |
| 48 |
|
| 49 |
distutils_enable_tests pytest |
| 50 |
|
| 51 |
+PATCHES=( |
| 52 |
+ "${FILESDIR}"/${P}-pyyaml60.patch |
| 53 |
+) |
| 54 |
+ |
| 55 |
python_prepare_all() { |
| 56 |
distutils-r1_python_prepare_all |
Archives