[med-svn] [Git][med-team/pll-modules][master] 2 commits: 2to3 patch on python test file

[Shayan Doust]

Shayan Doust pushed to branch master at Debian Med / pll-modules


Commits:
127411f8 by Shayan Doust at 2020-06-01T16:57:52+01:00
2to3 patch on python test file

- - - - -
9bdc6792 by Shayan Doust at 2020-06-01T16:58:36+01:00
Append python3 in control as build dependency

- - - - -


3 changed files:

- debian/control
- + debian/patches/2to3.patch
- debian/patches/series


Changes:

=====================================
debian/control
=====================================
@@ -7,7 +7,8 @@ Build-Depends: debhelper-compat (= 13),
                libpll-dev,
                zlib1g-dev,
                bison,
-               flex
+               flex,
+               python3
 Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/med-team/pll-modules
 Vcs-Git: https://salsa.debian.org/med-team/pll-modules.git


=====================================
debian/patches/2to3.patch
=====================================
@@ -0,0 +1,89 @@
+Description: apply 2to3 patch on test/runtest.py
+Author: Shayan Doust <hello at shayandoust.me>
+Last-Update: 2020-06-01
+---
+--- pll-modules.orig/test/runtest.py
++++ pll-modules/test/runtest.py
+@@ -252,7 +252,7 @@
+ 
+         success_count = success_count + result_ok*memory_ok
+ 
+-        print
++        print()
+ 
+   fancyprint("yellow", "{:<80}"
+     .format(" "),True)
+@@ -329,7 +329,7 @@
+ 
+         if skipOutput == "":
+           testSKIP()
+-          print
++          print()
+           result_ok = 1
+           memory_ok = 1
+         else:
+@@ -341,7 +341,7 @@
+             os.remove("tmperr")
+           else:
+             testFAIL()
+-            print
++            print()
+             call(["mv", "tmp", "result/"+filename+"_"+typestr+"_"+nowstr])
+             call(["mv", "tmperr", "result/"+filename+"_"+typestr+"_"+nowstr+".err"])
+             continue
+@@ -394,8 +394,8 @@
+ 
+   num_modules = len(test_modules)
+ 
+-  print("  %d modules" % num_modules)
+-  print
++  print(("  %d modules" % num_modules))
++  print()
+ 
+   files = []
+   for cur_mod in test_modules:
+@@ -404,16 +404,16 @@
+         continue
+     mod_files = [cur_mod+"/"+x for x in os.listdir("obj/"+cur_mod)]
+     fancyprint(modules[cur_mod], "    {:<15} {:>3} tests    ".format(cur_mod, len(mod_files)))
+-    print
++    print()
+     files = files + mod_files
+-  print
++  print()
+ 
+   files.sort()
+ 
+   num_tests   = len(files)
+ 
+-  print("  %d tests found in total" % num_tests)
+-  print("  %d sets of attributes" % len(all_args))
++  print(("  %d tests found in total" % num_tests))
++  print(("  %d sets of attributes" % len(all_args)))
+   if num_tests == 0:
+     sys.exit()
+ 
+@@ -425,7 +425,7 @@
+   if (len(sys.argv) > 1):
+     test_type = which_test.get(sys.argv[1])
+     if test_type == 2:
+-      print("  %d replicates" % num_replicates)
++      print(("  %d replicates" % num_replicates))
+       success_count = runSpeedTest(files)
+     else:
+       success_count = runValidation(files)
+@@ -433,7 +433,7 @@
+     success_count = runValidation(files)
+ 
+   # Final summary
+-  print
++  print()
+   global_run_time = int(time.time()*1000) - global_start_time
+   fancyprint("-", "Tests done... it took %d ms" % global_run_time, True)
+   fancyprint("green", "      %d/%d (%3.2f%%) OK"
+@@ -442,4 +442,4 @@
+     fancyprint("red", "      %d/%d (%3.2f%%) FAIL"
+       % (num_tests-success_count, num_tests, 100 - 100*success_count/num_tests), True)
+ 
+-  print
++  print()


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
+2to3.patch
 modify_test_makefile.patch



View it on GitLab: https://salsa.debian.org/med-team/pll-modules/-/compare/911ec2d17ba40bbbc62ce022772100dc1f73292c...9bdc679229414c9a1f5e89f2e8bbae1cea27406f

-- 
View it on GitLab: https://salsa.debian.org/med-team/pll-modules/-/compare/911ec2d17ba40bbbc62ce022772100dc1f73292c...9bdc679229414c9a1f5e89f2e8bbae1cea27406f
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200601/910b5716/attachment-0001.html>