commit: 371a6d24023d8c66b0ca4549853b7b1c15fe6b63
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 5 09:04:32 2024 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Mon Feb 5 11:28:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=371a6d24
dev-python/ffmpeg-python: fix collections import for _utils.py
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
...0711.ebuild => ffmpeg-python-0.2.0_p20220711-r1.ebuild} | 8 ++------
.../files/ffmpeg-python-0.2.0-collections.patch | 14 ++++++++++++++
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/dev-python/ffmpeg-python/ffmpeg-python-0.2.0_p20220711.ebuild
b/dev-python/ffmpeg-python/ffmpeg-python-0.2.0_p20220711-r1.ebuild
similarity index 75%
rename from dev-python/ffmpeg-python/ffmpeg-python-0.2.0_p20220711.ebuild
rename to dev-python/ffmpeg-python/ffmpeg-python-0.2.0_p20220711-r1.ebuild
index 751957b2d60f..c7249195f193 100644
--- a/dev-python/ffmpeg-python/ffmpeg-python-0.2.0_p20220711.ebuild
+++ b/dev-python/ffmpeg-python/ffmpeg-python-0.2.0_p20220711-r1.ebuild
@@ -4,6 +4,7 @@
EAPI=8
[[ "${PV}" == *_p20220711 ]] && COMMIT=df129c7ba30aaa9ffffb81a48f53aa7253b0b4e6
+
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{10..12} )
@@ -39,17 +40,12 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-0.2.0-no-future-795.patch"
+ "${FILESDIR}/${PN}-0.2.0-collections.patch"
)
EPYTEST_DESELECT=(
- ffmpeg/tests/test_ffmpeg.py::test__get_filter_complex_input
- ffmpeg/tests/test_ffmpeg.py::test__input__start_time
- ffmpeg/tests/test_ffmpeg.py::test__multi_output_edge_label_order
ffmpeg/tests/test_ffmpeg.py::test__probe
- ffmpeg/tests/test_ffmpeg.py::test__probe__extra_args
- ffmpeg/tests/test_ffmpeg.py::test_fluent_complex_filter
ffmpeg/tests/test_ffmpeg.py::test_pipe
- ffmpeg/tests/test_ffmpeg.py::test_repeated_args
)
distutils_enable_tests pytest
diff --git
a/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-collections.patch
b/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-collections.patch
new file mode 100644
index 000000000000..fe905e9670b7
--- /dev/null
+++ b/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-collections.patch
@@ -0,0 +1,14 @@
+--- a/ffmpeg/_utils.py
++++ b/ffmpeg/_utils.py
+@@ -3,6 +3,11 @@ from builtins import str
+ import hashlib
+ import sys
+
++try:
++ from collections.abc import Iterable
++except ImportError:
++ from collections import Iterable
++
+
+ def with_metaclass(meta, *bases):
+ class metaclass(meta):