Do not force the use of Python2

Author: MarcCote

scripts/smart-dispatch

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 
@@ -102,7 +102,7 @@ def main():
 
     # Generating all the worker commands
     worker_script = pjoin(os.path.dirname(smartdispatch.__file__), 'workers', 'base_worker.py')
-    COMMAND_STRING = 'cd "{cwd}"; python2 {worker_script} "{commands_file}" "{log_folder}" '\
+    COMMAND_STRING = 'cd "{cwd}"; python {worker_script} "{commands_file}" "{log_folder}" '\
                      '1>> "{log_folder}/worker/$PBS_JOBID\"\"_worker_{{ID}}.o" '\
                      '2>> "{log_folder}/worker/$PBS_JOBID\"\"_worker_{{ID}}.e" '
     COMMAND_STRING = COMMAND_STRING.format(cwd=os.getcwd(), worker_script=worker_script, commands_file=command_manager._commands_filename, log_folder=path_job_logs)

smartdispatch/workers/base_worker.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 import os

smartdispatch/workers/tests/test_base_worker.py

@@ -32,7 +32,7 @@ def tearDown(self):
         shutil.rmtree(self.logs_dir)
 
     def test_main(self):
-        command = ['python2', self.base_worker_script, self.command_manager._commands_filename, self.logs_dir]
+        command = ['python', self.base_worker_script, self.command_manager._commands_filename, self.logs_dir]
         assert_equal(call(command), 0)
         # Simulate a resume, i.e. re-run the command, the output/error should be concatenated.
         self.command_manager.set_commands_to_run(self.commands)
@@ -106,7 +106,7 @@ def test_main(self):
                 assert_equal("", logfile.read())
 
     def test_lock(self):
-        command = ['python2', self.base_worker_script, self.command_manager._commands_filename, self.logs_dir]
+        command = ['python', self.base_worker_script, self.command_manager._commands_filename, self.logs_dir]
 
         # Lock the commands file before running 'base_worker.py'
         with open_with_lock(self.command_manager._commands_filename, 'r+'):