From 79461d38ede6734da3cb728f909d6b513d7fad0c2c6b4874e751842843f64561 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 16 Sep 2021 10:22:15 +0000 Subject: [PATCH 1/5] - 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 From c6c80c9d3074ee515f272643f66b9b7197e6059f5a9b5de17622a764a5b437ed Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 16 Sep 2021 11:26:21 +0000 Subject: [PATCH 2/5] - Update to 4.5.1: large number of changes, see packaged CHANGES.rst for the complete list. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyInstaller?expand=0&rev=13 --- PyInstaller-3.6.tar.gz | 3 --- PyInstaller-4.5.1.tar.gz | 3 +++ python-PyInstaller.changes | 5 +++-- python-PyInstaller.spec | 10 +++++----- 4 files changed, 11 insertions(+), 10 deletions(-) delete mode 100644 PyInstaller-3.6.tar.gz create mode 100644 PyInstaller-4.5.1.tar.gz diff --git a/PyInstaller-3.6.tar.gz b/PyInstaller-3.6.tar.gz deleted file mode 100644 index ccf1f2a..0000000 --- a/PyInstaller-3.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3730fa80d088f8bb7084d32480eb87cbb4ddb64123363763cf8f2a1378c1c4b7 -size 3539593 diff --git a/PyInstaller-4.5.1.tar.gz b/PyInstaller-4.5.1.tar.gz new file mode 100644 index 0000000..421f8bd --- /dev/null +++ b/PyInstaller-4.5.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96fd6668c15a1dc4d0d53c96b2360fcc76d9e5ab3a3ad9328f2d39fec1557d51 +size 3436845 diff --git a/python-PyInstaller.changes b/python-PyInstaller.changes index e515264..b629293 100644 --- a/python-PyInstaller.changes +++ b/python-PyInstaller.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- -Thu Sep 16 10:21:46 UTC 2021 - Matej Cepl +Thu Sep 16 11:25:16 UTC 2021 - Matej Cepl -- Skip TestDeeplyNested.testRegr for gh#pyinstaller/pyinstaller#4406 +- Update to 4.5.1: large number of changes, see packaged CHANGES.rst for + the complete list. ------------------------------------------------------------------- Thu Apr 1 13:27:23 UTC 2021 - Markéta Machová diff --git a/python-PyInstaller.spec b/python-PyInstaller.spec index c5dd2c8..a1d99e6 100644 --- a/python-PyInstaller.spec +++ b/python-PyInstaller.spec @@ -19,15 +19,14 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %bcond_without python2 %bcond_without test +%define modname PyInstaller Name: python-PyInstaller -Version: 3.6 +Version: 4.5.1 Release: 0 Summary: Bundle a Python application and all its dependencies into a single package License: GPL-2.0-only URL: https://www.pyinstaller.org -Source: https://files.pythonhosted.org/packages/source/P/PyInstaller/PyInstaller-%{version}.tar.gz -# PATCH-FIX-UPSTREAM https://github.com/pyinstaller/pyinstaller/pull/5547/commits/589819183afc18f2d5b51dbbce68b7aca020c5e8 Bindepend: Skip/warn unrecognised output from ldconfig -Patch0: glibc233.patch +Source: https://github.com/pyinstaller/%{modname}/archive/refs/tags/v%{version}.tar.gz#/%{modname}-%{version}.tar.gz BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: fdupes @@ -57,6 +56,7 @@ BuildRequires: %{python_module pytest-xdist} BuildRequires: %{python_module pytest} BuildRequires: %{python_module qt5} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: upx %if %{with python2} BuildRequires: python-dis3 @@ -73,7 +73,7 @@ package. The user can run the packaged app without installing a Python interpreter or any modules. %prep -%setup -q -n PyInstaller-%{version} +%setup -q -n pyinstaller-%{version} %autopatch -p1 chmod a-x PyInstaller/utils/hooks/__init__.py From e96a370718387e701ad765bc0447024d3c9138c796304b8100f2a2d66bfcd2e9 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 18 Sep 2021 09:16:13 +0000 Subject: [PATCH 3/5] Fix changes OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyInstaller?expand=0&rev=14 --- python-PyInstaller.changes | 3 ++- python-PyInstaller.spec | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/python-PyInstaller.changes b/python-PyInstaller.changes index b629293..f0afbc4 100644 --- a/python-PyInstaller.changes +++ b/python-PyInstaller.changes @@ -3,12 +3,13 @@ Thu Sep 16 11:25:16 UTC 2021 - Matej Cepl - Update to 4.5.1: large number of changes, see packaged CHANGES.rst for the complete list. +- Update glibc233.patch ------------------------------------------------------------------- Thu Apr 1 13:27:23 UTC 2021 - Markéta Machová - Automagically skip matplotlib tests because matplotlib dropped python36 -- Add glibc233.patch to fix recent test failure +- Add glibc233.patch to fix recent test failure (gh#pyinstaller/pyinstaller#5540) ------------------------------------------------------------------- Wed Mar 18 07:22:03 UTC 2020 - Tomáš Chvátal diff --git a/python-PyInstaller.spec b/python-PyInstaller.spec index a1d99e6..fb1c307 100644 --- a/python-PyInstaller.spec +++ b/python-PyInstaller.spec @@ -27,6 +27,9 @@ Summary: Bundle a Python application and all its dependencies into a sing License: GPL-2.0-only URL: https://www.pyinstaller.org Source: https://github.com/pyinstaller/%{modname}/archive/refs/tags/v%{version}.tar.gz#/%{modname}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM glibc233.patch gh#pyinstaller/pyinstaller#5540 mcepl@suse.com +# Skip/warn unrecognised output from ldconfig +Patch0: glibc233.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: fdupes From acede97718abe1124a4d8e408cf5c57f089144b61c04741d8f0225dad56afce8 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 18 Sep 2021 09:17:16 +0000 Subject: [PATCH 4/5] Fix SPEC file OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyInstaller?expand=0&rev=15 --- python-PyInstaller.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-PyInstaller.spec b/python-PyInstaller.spec index fb1c307..e73c561 100644 --- a/python-PyInstaller.spec +++ b/python-PyInstaller.spec @@ -78,6 +78,7 @@ interpreter or any modules. %prep %setup -q -n pyinstaller-%{version} %autopatch -p1 + chmod a-x PyInstaller/utils/hooks/__init__.py # Force build of bootloader From ef9c560bb9f2955ef3396b72df411d18327a410d6294c27dce0d7792bbf307b7 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 18 Sep 2021 09:20:39 +0000 Subject: [PATCH 5/5] - Remove glibc233.patch (included upstream) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyInstaller?expand=0&rev=16 --- glibc233.patch | 39 -------------------------------------- python-PyInstaller.changes | 2 +- python-PyInstaller.spec | 3 --- 3 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 glibc233.patch diff --git a/glibc233.patch b/glibc233.patch deleted file mode 100644 index edd7784..0000000 --- a/glibc233.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 589819183afc18f2d5b51dbbce68b7aca020c5e8 Mon Sep 17 00:00:00 2001 -From: bwoodsend -Date: Wed, 10 Feb 2021 19:53:28 +0000 -Subject: [PATCH] Bindepend: Skip/warn unrecognised output from ldconfig - (#5540). [skip-ci] - -ldconfig has started adding additional lines of output such as: - - Cache generated by: ldconfig (GNU libc) release release version 2.33 - -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 ++++++++++++ - 1 file changed, 12 insertions(+) - create mode 100644 news/5540.bugfix.rst - ---- a/PyInstaller/depend/utils.py -+++ b/PyInstaller/depend/utils.py -@@ -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) -+ -+ # Sanitize away any abnormal lines of output. -+ if m is None: -+ # Warn about it then skip the rest of this iteration. -+ if re.search("Cache generated by:", line): -+ # See #5540. This particular line is harmless. -+ pass -+ else: -+ logger.warning( -+ "Unrecognised line of output %r from ldconfig", line) -+ continue -+ - path = m.groups()[-1] - if is_freebsd or is_openbsd: - # Insert `.so` at the end of the lib's basename. soname diff --git a/python-PyInstaller.changes b/python-PyInstaller.changes index f0afbc4..5435142 100644 --- a/python-PyInstaller.changes +++ b/python-PyInstaller.changes @@ -3,7 +3,7 @@ Thu Sep 16 11:25:16 UTC 2021 - Matej Cepl - Update to 4.5.1: large number of changes, see packaged CHANGES.rst for the complete list. -- Update glibc233.patch +- Remove glibc233.patch (included upstream) ------------------------------------------------------------------- Thu Apr 1 13:27:23 UTC 2021 - Markéta Machová diff --git a/python-PyInstaller.spec b/python-PyInstaller.spec index e73c561..8d1edd5 100644 --- a/python-PyInstaller.spec +++ b/python-PyInstaller.spec @@ -27,9 +27,6 @@ Summary: Bundle a Python application and all its dependencies into a sing License: GPL-2.0-only URL: https://www.pyinstaller.org Source: https://github.com/pyinstaller/%{modname}/archive/refs/tags/v%{version}.tar.gz#/%{modname}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM glibc233.patch gh#pyinstaller/pyinstaller#5540 mcepl@suse.com -# Skip/warn unrecognised output from ldconfig -Patch0: glibc233.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: fdupes