diff --git a/openEuler-sleep-when-raise-TimeoutError.patch b/openEuler-sleep-when-raise-TimeoutError.patch new file mode 100644 index 0000000000000000000000000000000000000000..502602277834df87aa995fcf528001c4de3698e3 --- /dev/null +++ b/openEuler-sleep-when-raise-TimeoutError.patch @@ -0,0 +1,25 @@ +From e83ca01351756b7bcc52b2ef89d770bca9b9c34b Mon Sep 17 00:00:00 2001 +From: shixuantong +Date: Fri, 22 Oct 2021 15:18:27 +0800 +Subject: [PATCH] sleep when raise TimeoutError + +--- + Lib/test/test_concurrent_futures.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py +index a261bfe..d67654c 100644 +--- a/Lib/test/test_concurrent_futures.py ++++ b/Lib/test/test_concurrent_futures.py +@@ -985,6 +985,8 @@ class ExecutorDeadlockTest: + # If we did not recover before TIMEOUT seconds, + # consider that the executor is in a deadlock state + self._fail_on_deadlock(executor) ++ import time ++ time.sleep(18000) + executor.shutdown(wait=True) + + def test_shutdown_deadlock(self): +-- +1.8.3.1 + diff --git a/python3.spec b/python3.spec index 94bab58d427eab2a0452716e6ffb1353e26bd2b0..b55bbb2722946ba1b55710f8edac0b76b9db3681 100644 --- a/python3.spec +++ b/python3.spec @@ -3,14 +3,14 @@ Summary: Interpreter of the Python3 programming language URL: https://www.python.org/ Version: 3.7.9 -Release: 14 +Release: 15 License: Python %global branchversion 3.7 %global pyshortver 37 %ifarch %{ix86} x86_64 -%bcond_without optimizations +%bcond_with optimizations %else %bcond_with optimizations %endif @@ -38,7 +38,7 @@ License: Python %global wordsize 64 -BuildRequires: autoconf +BuildRequires: autoconf python3-devel BuildRequires: bluez-libs-devel BuildRequires: bzip2 BuildRequires: bzip2-devel @@ -143,6 +143,8 @@ Patch6032: backport-35823-Allow-setsid-after-vfork-on-Linux.-GH-2294.patch Patch6033: backport-42146-Fix-memory-leak-in-subprocess.Popen-in-cas.patch Patch6034: backport-42146-Unify-cleanup-in-subprocess_fork_exec-GH-2.patch +Patch9000: openEuler-sleep-when-raise-TimeoutError.patch + Recommends: %{name}-help = %{version}-%{release} Provides: python%{branchversion} = %{version}-%{release} Provides: python(abi) = %{branchversion} @@ -272,6 +274,8 @@ rm Lib/ensurepip/_bundled/*.whl %patch6033 -p1 %patch6034 -p1 +%patch9000 -p1 + sed -i "s/generic_os/%{_vendor}/g" Lib/platform.py rm configure pyconfig.h.in @@ -872,6 +876,12 @@ export BEP_GTDLIST="$BEP_GTDLIST_TMP" %{_mandir}/*/* %changelog +* Sat Oct 09 2021 shixuantong - 3.7.9-15 +- Type:bugfix +- ID:NA +- SUG:NA +- DES:disable profile guided optimizations for x86_64 architectures + * Web Jun 23 2021 hanxinke - 3.7.9-14 - Type:enhancement - CVE:NA