Use Python3 in build time test suite

Last-Update: Sun, 04 Aug 2019 09:15:35 +0200

Gbp-Pq: Name python3.patch

diff --git a/meson.build b/meson.build
index 7dc4ec2fd5ec1a58b3fc825063ebd4fbfa04d2cb..66b587310e0e6d2ae60c5e991a6f2e56057d95b0 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -83,7 +83,7 @@ subdir('src')
 
 if not meson.is_subproject()
   if get_option('build-tools') or get_option('tests')
-    pbbam_python = find_program('python')
+    pbbam_python = find_program('python3')
 
     if get_option('tests')
       pbbam_clang_formatter = find_program('tools/check-formatting')

diff --git a/tests/scripts/generate_data.py b/tests/scripts/generate_data.py
index 278acb5d2ad8ec642149e9f52555dc48c9f0c1bd..61c55842c611c1ea3db74d971c6fca6bf3bcc27b 100755 (executable)
--- a/tests/scripts/generate_data.py
+++ b/tests/scripts/generate_data.py
@@ -1,7 +1,4 @@
-#!/usr/bin/env python
-
-from __future__ import print_function
-from __future__ import unicode_literals
+#!/usr/bin/python3
 
 import os, shutil, sys
 from io import StringIO
@@ -177,9 +174,9 @@ class TestDataGenerator:
         # else silent success
         if self.outputFiles or self.outputSymlinks:
             print('Generating test data in %s ' % self.generatedDataDir)
-            for file, func in self.outputFiles.items():
+            for file, func in list(self.outputFiles.items()):
                 func(file)
-            for link, func in self.outputSymlinks.items():
+            for link, func in list(self.outputSymlinks.items()):
                 func(link)
 
 # script entry point