From 833e4bd708c2df375987aeae1258648c33d99f93 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Nov 02 2017 16:32:00 +0000 Subject: Update to 3.4.7 Dropped patch 212 as it has been upstreamed. Rebased patch 55. Added patch 273 to skip test_float due to rhbz#1484497. --- diff --git a/.gitignore b/.gitignore index ec41e6d..a6ff50e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /Python-3.4.3.tar.xz /Python-3.4.5.tar.xz +/Python-3.4.7.tar.xz diff --git a/00055-systemtap.patch b/00055-systemtap.patch index 3200c15..db4d006 100644 --- a/00055-systemtap.patch +++ b/00055-systemtap.patch @@ -674,21 +674,6 @@ diff -up Python-3.3.0rc2/Makefile.pre.in.systemtap Python-3.3.0rc2/Makefile.pre. profile-removal: find . -name '*.gc??' -exec rm -f {} ';' -diff -up Python-3.3.0rc2/Misc/NEWS.systemtap Python-3.3.0rc2/Misc/NEWS ---- Python-3.3.0rc2/Misc/NEWS.systemtap 2012-09-09 05:11:05.000000000 -0400 -+++ Python-3.3.0rc2/Misc/NEWS 2012-09-10 09:17:21.120511781 -0400 -@@ -619,6 +619,11 @@ Core and Builtins - - - Issue #15038: Optimize python Locks on Windows. - -+- Issue #14776: Added a new --with-systemtap configure-time option, which adds -+ static markers for SystemTap so that SystemTap scripts can observe bytecode -+ frames being entered and exited and so generate reports on what Python code -+ is being exectuted. -+ - Library - ------- - diff -up Python-3.3.0rc2/pyconfig.h.in.systemtap Python-3.3.0rc2/pyconfig.h.in --- Python-3.3.0rc2/pyconfig.h.in.systemtap 2012-09-09 05:11:14.000000000 -0400 +++ Python-3.3.0rc2/pyconfig.h.in 2012-09-10 09:17:21.120511781 -0400 diff --git a/00212-fix-test-pyexpat-failure.patch b/00212-fix-test-pyexpat-failure.patch deleted file mode 100644 index 7b40280..0000000 --- a/00212-fix-test-pyexpat-failure.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -r 682a8e36dd18 Lib/test/test_pyexpat.py ---- a/Lib/test/test_pyexpat.py Tue Jul 05 17:08:52 2016 +0300 -+++ b/Lib/test/test_pyexpat.py Thu Jul 07 17:04:35 2016 +0800 -@@ -656,11 +656,9 @@ - # \xc2\x85 is UTF-8 encoded U+0085 (NEXT LINE) - xml = b"\r\n" - parser = expat.ParserCreate() -- try: -+ err_pattern = r'XML declaration not well-formed: line 1, column \d+' -+ with self.assertRaisesRegex(expat.ExpatError, err_pattern): - parser.Parse(xml, True) -- self.fail() -- except expat.ExpatError as e: -- self.assertEqual(str(e), 'XML declaration not well-formed: line 1, column 14') - - class ErrorMessageTest(unittest.TestCase): - def test_codes(self): diff --git a/00273-skip-float-test.patch b/00273-skip-float-test.patch new file mode 100644 index 0000000..4658731 --- /dev/null +++ b/00273-skip-float-test.patch @@ -0,0 +1,13 @@ +diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py +index 24fe128..d7dd939 100644 +--- a/Lib/test/test_float.py ++++ b/Lib/test/test_float.py +@@ -107,7 +107,7 @@ class GeneralFloatCases(unittest.TestCase): + else: + self.fail("Expected int(%r) to raise a ValueError", s) + +- ++ @unittest.skip('Fails in Koji: https://bugzilla.redhat.com/show_bug.cgi?id=1484497') + @support.run_with_locale('LC_NUMERIC', 'fr_FR', 'de_DE') + def test_float_with_comma(self): + # set locale to something that doesn't use '.' for the decimal point diff --git a/python34.spec b/python34.spec index f195794..717ab99 100644 --- a/python34.spec +++ b/python34.spec @@ -125,8 +125,8 @@ # ================== Summary: Version 3.4 of the Python programming language Name: python%{pyshortver} -Version: %{pybasever}.5 -Release: 8%{?dist} +Version: %{pybasever}.7 +Release: 1%{?dist} License: Python Group: Development/Languages @@ -486,12 +486,6 @@ Patch201: 00201-fix-memory-leak-in-gdbm.patch # test_threading fails in koji dues to it's handling of signals Patch203: 00203-disable-threading-test-koji.patch -# 00212 # -# Fix test breakage with version 2.2.0 of Expat -# rhbz#1353918: https://bugzilla.redhat.com/show_bug.cgi?id=1353918 -# NOT YET FIXED UPSTREAM: http://bugs.python.org/issue27369 -Patch212: 00212-fix-test-pyexpat-failure.patch - # 00250 # # After glibc-2.24.90, Python 3 failed to start on EL7 kernel # rhbz#1410175: https://bugzilla.redhat.com/show_bug.cgi?id=1410175 @@ -501,6 +495,11 @@ Patch212: 00212-fix-test-pyexpat-failure.patch # https://hg.python.org/cpython/rev/13a39142c047 Patch250: 00250-getentropy.patch +# 00273 # +# Skip test_float_with_comma, which fails in Koji with UnicodeDecodeError +# See https://bugzilla.redhat.com/show_bug.cgi?id=1484497 +Patch273: 00273-skip-float-test.patch + # (New patches go here ^^^) # # When adding new patches to "python" and "python3" in Fedora 17 onwards, @@ -652,8 +651,8 @@ done %patch194 -p1 %patch196 -p1 %patch203 -p1 -%patch212 -p1 %patch250 -p1 +%patch273 -p1 # Currently (2010-01-15), http://docs.python.org/library is for 2.6, and there # are many differences between 2.6 and the Python 3 library. @@ -1208,6 +1207,9 @@ CheckPython optimized # ====================================================== %changelog +* Thu Nov 02 2017 Charalampos Stratakis - 3.4.7-1 +- Update to 3.4.7 + * Mon Aug 14 2017 David "Sanqui" Labský - 3.4.5-8 - Drop unused db4-devel dependency diff --git a/sources b/sources index f4a639a..b54c52f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5caaca47eead170070a856fae5f6e78c Python-3.4.5.tar.xz +SHA512 (Python-3.4.7.tar.xz) = 34d303f510210d7e695f65f69819049bdf71607b100cf4658af4620b14385f2e5acc3363f2e1b573509cca651e91c836ccd4fb00982f061a58e9b5c9504cd060