diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2021-10-14 09:30:43 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2021-10-15 11:43:56 -0400 |
| commit | fffd8606988d3eebc7324f6353d01469c18cfe81 (patch) | |
| tree | b74aa9b72c0063a894b491ed88f7d19bdc552ace /www-client/qutebrowser | |
| parent | www-client/qutebrowser: sync and update live ebuild (diff) | |
| download | gentoo-fffd8606988d3eebc7324f6353d01469c18cfe81.tar.gz gentoo-fffd8606988d3eebc7324f6353d01469c18cfe81.tar.bz2 gentoo-fffd8606988d3eebc7324f6353d01469c18cfe81.zip | |
www-client/qutebrowser: backport pyyaml-6.0 test fix
Closes: https://github.com/gentoo/gentoo/pull/22571
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'www-client/qutebrowser')
| -rw-r--r-- | www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch | 19 | ||||
| -rw-r--r-- | www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild | 4 |
2 files changed, 23 insertions, 0 deletions
diff --git a/www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch b/www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch new file mode 100644 index 000000000000..d585109b9f2c --- /dev/null +++ b/www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch @@ -0,0 +1,19 @@ +https://github.com/qutebrowser/qutebrowser/commit/1547a48 +From: Florian Bruhin <me@the-compiler.org> +Date: Thu, 14 Oct 2021 09:05:07 +0200 +Subject: [PATCH] tests: Adjust for PyYAML 6.0 +--- a/tests/unit/utils/test_utils.py ++++ b/tests/unit/utils/test_utils.py +@@ -809,8 +809,11 @@ def test_load(self): + assert utils.yaml_load("[1, 2]") == [1, 2] + + def test_load_float_bug(self): +- with pytest.raises(yaml.YAMLError): ++ try: + utils.yaml_load("._") ++ except yaml.YAMLError: ++ # Either no exception or YAMLError, not ValueError ++ pass + + def test_load_file(self, tmp_path): + tmpfile = tmp_path / 'foo.yml' diff --git a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild index f196542337c4..3a90e9763a2d 100644 --- a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild +++ b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild @@ -58,6 +58,10 @@ BDEPEND=" distutils_enable_tests pytest +PATCHES=( + "${FILESDIR}"/${P}-pyyaml60.patch +) + python_prepare_all() { distutils-r1_python_prepare_all |