From 6f82ae126d19e91e30c8aba02ba49ffb7cd54e877d89fab99ce68448c9712ad1 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 16 Sep 2021 10:22:15 +0000 Subject: [PATCH] - Skip TestDeeplyNested.testRegr for gh#pyinstaller/pyinstaller#4406 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyInstaller?expand=0&rev=12 --- glibc233.patch | 9 +++------ python-PyInstaller.changes | 5 +++++ python-PyInstaller.spec | 5 +++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/glibc233.patch b/glibc233.patch index 1046dbe..edd7784 100644 --- a/glibc233.patch +++ b/glibc233.patch @@ -12,16 +12,13 @@ which caused regex parse errors. This particular line is now whitelisted as skipable. And any future unrecognised patterns will now issue warnings. --- - PyInstaller/depend/utils.py | 12 ++++++++++++ - news/5540.bugfix.rst | 3 +++ - 2 files changed, 15 insertions(+) + PyInstaller/depend/utils.py | 12 ++++++++++++ + 1 file changed, 12 insertions(+) create mode 100644 news/5540.bugfix.rst -diff --git a/PyInstaller/depend/utils.py b/PyInstaller/depend/utils.py -index baffb2a9f3..95846f39d5 100644 --- a/PyInstaller/depend/utils.py +++ b/PyInstaller/depend/utils.py -@@ -399,6 +399,18 @@ def load_ldconfig_cache(): +@@ -397,6 +397,18 @@ def load_ldconfig_cache(): for line in text: # :fixme: this assumes libary names do not contain whitespace m = pattern.match(line) diff --git a/python-PyInstaller.changes b/python-PyInstaller.changes index 8a9fb7b..e515264 100644 --- a/python-PyInstaller.changes +++ b/python-PyInstaller.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 16 10:21:46 UTC 2021 - Matej Cepl + +- Skip TestDeeplyNested.testRegr for gh#pyinstaller/pyinstaller#4406 + ------------------------------------------------------------------- Thu Apr 1 13:27:23 UTC 2021 - Markéta Machová diff --git a/python-PyInstaller.spec b/python-PyInstaller.spec index 5c9b38f..c5dd2c8 100644 --- a/python-PyInstaller.spec +++ b/python-PyInstaller.spec @@ -39,7 +39,7 @@ Requires: python-macholib >= 1.8 Requires: python-pefile >= 2017.8.1 Requires: python-setuptools Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives Recommends: upx %if %{with test} BuildRequires: %{python_module Babel} @@ -106,7 +106,8 @@ fi %check export LANG=en_US.UTF-8 # test_get_co_using_ctypes, test_get_co_using_ctypes_from_extension, test_replace_paths_in_code broken with python 3.8 on PyInstall 3.6 -%pytest_arch -n auto tests/unit -k 'not (test_find_module or test_egg and not test_nspkg1 or test_get_co_using_ctypes or test_get_co_using_ctypes_from_extension or test_replace_paths_in_code)' +# gh#pyinstaller/pyinstaller#4406 skip TestDeeplyNested.testRegr (it is just the only method in the class) +%pytest_arch -n auto tests/unit -k 'not (test_find_module or test_egg and not test_nspkg1 or test_get_co_using_ctypes or test_get_co_using_ctypes_from_extension or test_replace_paths_in_code or TestDeeplyNested)' %endif %post