diff --git a/00335-backport-pathfix-change.patch b/00335-backport-pathfix-change.patch index 7532ca1..92faf6e 100644 --- a/00335-backport-pathfix-change.patch +++ b/00335-backport-pathfix-change.patch @@ -27,19 +27,6 @@ Date: Mon Nov 4 10:45:49 2019 +0100 Add flag -k to pathscript.py script: preserve shebang flags - From 2b7dc40b2af6578181808ba73c1533fc114e55df Mon Sep 17 00:00:00 2001 - From: Ruediger Pluem - Date: Fri, 11 Oct 2019 15:36:50 +0200 - Subject: [PATCH] bpo-38347: find pathfix for Python scripts whose name contain - a '-' (GH-16536) - - pathfix.py: Assume all files that end on '.py' are Python scripts when working recursively. - --- - Lib/test/test_tools/test_pathfix.py | 34 +++++++++++++++---- - .../2019-10-02-09-48-42.bpo-38347.2Tq5D1.rst | 1 + - Tools/scripts/pathfix.py | 5 +-- - 3 files changed, 30 insertions(+), 10 deletions(-) - create mode 100644 Misc/NEWS.d/next/Tools-Demos/2019-10-02-09-48-42.bpo-38347.2Tq5D1.rst diff --git a/Lib/test/test_tools/test_pathfix.py b/Lib/test/test_tools/test_pathfix.py new file mode 100644 index 0000000..ec36117 @@ -183,15 +170,8 @@ index 0000000..d1210e2 @@ -0,0 +1,2 @@ +Add option -k to pathscript.py script: preserve shebang flags. +Add option -a to pathscript.py script: add flags. -diff --git a/Misc/NEWS.d/next/Tools-Demos/2019-10-02-09-48-42.bpo-38347.2Tq5D1.rst b/Misc/NEWS.d/next/Tools-Demos/2019-10-02-09-48-42.bpo-38347.2Tq5D1.rst -new file mode 100644 -index 0000000..ae64a31 ---- /dev/null -+++ b/Misc/NEWS.d/next/Tools-Demos/2019-10-02-09-48-42.bpo-38347.2Tq5D1.rst -@@ -0,0 +1 @@ -+pathfix.py: Assume all files that end on '.py' are Python scripts when working recursively. diff --git a/Tools/scripts/pathfix.py b/Tools/scripts/pathfix.py -index c5bf984..c5ba18b 100755 +index 28ee428..127c2fe 100755 --- a/Tools/scripts/pathfix.py +++ b/Tools/scripts/pathfix.py @@ -1,6 +1,6 @@ @@ -255,20 +235,7 @@ index c5bf984..c5ba18b 100755 if not new_interpreter or not new_interpreter.startswith(b'/') or \ not args: err('-i option or file-or-directory missing\n') -@@ -70,9 +88,10 @@ def main(): - if fix(arg): bad = 1 - sys.exit(bad) - --ispythonprog = re.compile(r'^[a-zA-Z0-9_]+\.py$') -+ - def ispython(name): -- return bool(ispythonprog.match(name)) -+ return name.endswith('.py') -+ - - def recursedown(dirname): - dbg('recursedown(%r)\n' % (dirname,)) -@@ -96,6 +115,7 @@ def recursedown(dirname): +@@ -96,6 +114,7 @@ def recursedown(dirname): if recursedown(fullname): bad = 1 return bad @@ -276,7 +243,7 @@ index c5bf984..c5ba18b 100755 def fix(filename): ## dbg('fix(%r)\n' % (filename,)) try: -@@ -166,12 +186,43 @@ def fix(filename): +@@ -166,12 +185,43 @@ def fix(filename): # Return success return 0 diff --git a/python3.spec b/python3.spec index 6b50b8e..c0629cf 100644 --- a/python3.spec +++ b/python3.spec @@ -13,11 +13,11 @@ URL: https://www.python.org/ # WARNING When rebasing to a new Python version, # remember to update the python3-docs package as well -%global general_version %{pybasever}.5 +%global general_version %{pybasever}.6 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?dist} +Release: 1%{?dist} License: Python @@ -1506,6 +1506,9 @@ CheckPython optimized # ====================================================== %changelog +* Thu Dec 19 2019 Miro HronĨok - 3.7.6-1 +- Update to 3.7.6 + * Thu Dec 05 2019 Patrik Kopkan - 3.7.5-2 - pathfix.py: add -k (keep) and -a (add) command line options, assume all .py files are Python scripts when working recursively diff --git a/sources b/sources index 6ee4f17..96b6820 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (Python-3.7.5.tar.xz) = f4f3879881f260f58dbb041fb0f2f210d4b70b02a739e41e50e6fea67d31855a7a29ce4ebef66bfde3d0edf54b946a48f78490f986da965357b835d4dbb3f414 -SHA512 (Python-3.7.5.tar.xz.asc) = f06e0cf03e124ec04b0367e36c4c8a370658c257189b4ee5de5d6342d2d718ac569b8fd4db77e31c82c3a4c3a8ee3b3f1e9e29d3dfe14a630f335a856ed867bc +SHA512 (Python-3.7.6.tar.xz) = 5be022c384728b0c6709d165486f66226d126c521b466ed24d0c4c3c5910ec786a734f4c2c916ac409213c54a492b9fb230fb721c41e3de281676a7e9d8f3171 +SHA512 (Python-3.7.6.tar.xz.asc) = d9b735fa3f7eeefddb947993e66aed1657454ecb61b0cebd9545ed6c0bbfd237142be21ad9fa92050b8c72d88f2e773867885d47909ebac6021f79bd94ee54f6