From a0d16b6201c4d7a8bb762073f61be5901702c06d Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Jul 09 2015 08:25:34 +0000 Subject: Correct pip version and remove "disable threading test koji" --- diff --git a/00203-disable-threading-test-koji.patch b/00203-disable-threading-test-koji.patch deleted file mode 100644 index 70010fb..0000000 --- a/00203-disable-threading-test-koji.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up Python-3.4.3/Lib/test/test_threading.py.mstuchli Python-3.4.3/Lib/test/test_threading.py ---- Python-3.4.3/Lib/test/test_threading.py.mstuchli 2015-03-10 10:00:42.917355215 +0100 -+++ Python-3.4.3/Lib/test/test_threading.py 2015-03-10 10:00:47.735373842 +0100 -@@ -988,6 +988,7 @@ class ThreadingExceptionTests(BaseTestCa - self.assertIn("ZeroDivisionError", err) - self.assertNotIn("Unhandled exception", err) - -+ @unittest.skip('Fails in Koji due to mishandled signals') - def test_print_exception_stderr_is_none_1(self): - script = r"""if True: - import sys diff --git a/python3.spec b/python3.spec index fdef0b9..c790fa1 100644 --- a/python3.spec +++ b/python3.spec @@ -727,9 +727,6 @@ Patch201: 00201-fix-memory-leak-in-gdbm.patch # http://bugs.python.org/issue23433 Patch202: 00202-fix-undefined-behaviour-in-faulthandler.patch -# test_threading fails in koji dues to it's handling of signals -Patch203: 00203-disable-threading-test-koji.patch - # openssl requires DH keys to be > 768bits Patch204: 00204-increase-dh-keys-size.patch @@ -913,7 +910,7 @@ for f in md5module.c sha1module.c sha256module.c sha512module.c; do done %if 0%{with_rewheel} -%global pip_version 7.0.3 +%global pip_version 6.0.8 sed -r -i s/'_PIP_VERSION = "[0-9.]+"'/'_PIP_VERSION = "%{pip_version}"'/ Lib/ensurepip/__init__.py %endif @@ -1020,7 +1017,6 @@ sed -r -i s/'_PIP_VERSION = "[0-9.]+"'/'_PIP_VERSION = "%{pip_version}"'/ Lib/en # 00197: upstream as of Python 3.4.2 %patch199 -p1 %patch202 -p1 -%patch203 -p1 %patch204 -p1 # Currently (2010-01-15), http://docs.python.org/library is for 2.6, and there