diff --git a/F00102-lib64.patch b/F00102-lib64.patch index 18ac3ba..8b07d52 100644 --- a/F00102-lib64.patch +++ b/F00102-lib64.patch @@ -130,7 +130,7 @@ Co-authored-by: Iryna Shcherbina 'data': '{userbase}', --- a/Lib/test/test_site.py +++ b/Lib/test/test_site.py -@@ -266,8 +266,8 @@ class HelperFunctionsTests(unittest.Test +@@ -267,8 +267,8 @@ class HelperFunctionsTests(unittest.Test dirs = site.getsitepackages() if os.sep == '/': # OS X, Linux, FreeBSD, etc @@ -183,7 +183,7 @@ Co-authored-by: Iryna Shcherbina } --- a/configure +++ b/configure -@@ -15188,9 +15188,9 @@ fi +@@ -15214,9 +15214,9 @@ fi if test x$PLATFORM_TRIPLET = x; then @@ -197,7 +197,7 @@ Co-authored-by: Iryna Shcherbina --- a/configure.ac +++ b/configure.ac -@@ -4674,9 +4674,9 @@ fi +@@ -4689,9 +4689,9 @@ fi dnl define LIBPL after ABIFLAGS and LDVERSION is defined. AC_SUBST(PY_ENABLE_SHARED) if test x$PLATFORM_TRIPLET = x; then diff --git a/SUSE-FEDORA-multilib.patch b/SUSE-FEDORA-multilib.patch index 48f09de..a386007 100644 --- a/SUSE-FEDORA-multilib.patch +++ b/SUSE-FEDORA-multilib.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -4671,12 +4671,26 @@ else +@@ -4686,12 +4686,26 @@ else LIBPYTHON='' fi @@ -267,7 +267,7 @@ addsitedir(sitedir, known_paths) --- a/Lib/test/test_site.py +++ b/Lib/test/test_site.py -@@ -266,8 +266,11 @@ class HelperFunctionsTests(unittest.Test +@@ -267,8 +267,11 @@ class HelperFunctionsTests(unittest.Test dirs = site.getsitepackages() if os.sep == '/': # OS X, Linux, FreeBSD, etc @@ -314,7 +314,7 @@ # just making sure _main() runs and returns things in the stdout --- a/configure +++ b/configure -@@ -15188,9 +15188,9 @@ fi +@@ -15214,9 +15214,9 @@ fi if test x$PLATFORM_TRIPLET = x; then @@ -361,7 +361,7 @@ import tempfile import textwrap -@@ -1070,12 +1071,13 @@ class InitConfigTests(EmbeddingTestsMixi +@@ -1072,12 +1073,13 @@ class InitConfigTests(EmbeddingTestsMixi return config['config']['module_search_paths'] else: ver = sys.version_info @@ -377,7 +377,7 @@ f'python{ver.major}.{ver.minor}', 'lib-dynload'), ] -@@ -1180,13 +1182,15 @@ class InitConfigTests(EmbeddingTestsMixi +@@ -1188,13 +1190,15 @@ class InitConfigTests(EmbeddingTestsMixi def test_init_pyvenv_cfg(self): # Test path configuration with pyvenv.cfg configuration file diff --git a/bpo34022-stop_hash-based_invalidation_w_SOURCE_DATE_EPOCH.patch b/bpo34022-stop_hash-based_invalidation_w_SOURCE_DATE_EPOCH.patch index b92feba..e155da6 100644 --- a/bpo34022-stop_hash-based_invalidation_w_SOURCE_DATE_EPOCH.patch +++ b/bpo34022-stop_hash-based_invalidation_w_SOURCE_DATE_EPOCH.patch @@ -70,7 +70,7 @@ subsequent commits. class EncodingTest(unittest.TestCase): """Issue 6716: compileall should escape source code when printing errors to stdout.""" -@@ -579,6 +594,21 @@ class CommandLineTestsBase: +@@ -620,6 +635,21 @@ class CommandLineTestsBase: class CommmandLineTestsWithSourceEpoch(CommandLineTestsBase, @@ -124,8 +124,8 @@ subsequent commits. --- a/Lib/test/test_py_compile.py +++ b/Lib/test/test_py_compile.py -@@ -216,5 +216,19 @@ class PyCompileTestsWithoutSourceEpoch(P - pass +@@ -272,5 +272,19 @@ class PyCompileCLITestCase(unittest.Test + self.assertIn(b'No such file or directory', stderr) +class PyCompileTestsWithSourceEpoch(PyCompileTestsBase, diff --git a/subprocess-raise-timeout.patch b/subprocess-raise-timeout.patch index 98d751e..ffbd28f 100644 --- a/subprocess-raise-timeout.patch +++ b/subprocess-raise-timeout.patch @@ -1,6 +1,6 @@ --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py -@@ -1124,7 +1124,8 @@ class ProcessTestCase(BaseTestCase): +@@ -1125,7 +1125,8 @@ class ProcessTestCase(BaseTestCase): self.assertIn("0.0001", str(c.exception)) # For coverage of __str__. # Some heavily loaded buildbots (sparc Debian 3.x) require this much # time to start.