1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75
|
Description: Use python3 paths explicitly.
Note: python2->python3 changs in python3.patch
Author: Alastair McKinstry <mckintry@debian.org>
Last-Updated: 2020-12-09
Forwarded: no
Index: cctools-7.13.1/makeflow/src/makeflow_archive_query
===================================================================
--- cctools-7.13.1.orig/makeflow/src/makeflow_archive_query
+++ cctools-7.13.1/makeflow/src/makeflow_archive_query
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
import hashlib
import os
Index: cctools-7.13.1/makeflow/src/makeflow_ec2_cleanup
===================================================================
--- cctools-7.13.1.orig/makeflow/src/makeflow_ec2_cleanup
+++ cctools-7.13.1/makeflow/src/makeflow_ec2_cleanup
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
import json
import sys
Index: cctools-7.13.1/makeflow/src/makeflow_ec2_setup
===================================================================
--- cctools-7.13.1.orig/makeflow/src/makeflow_ec2_setup
+++ cctools-7.13.1/makeflow/src/makeflow_ec2_setup
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
import json
import sys
Index: cctools-7.13.1/makeflow/src/makeflow_ec2_estimate
===================================================================
--- cctools-7.13.1.orig/makeflow/src/makeflow_ec2_estimate
+++ cctools-7.13.1/makeflow/src/makeflow_ec2_estimate
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
import os
import json
Index: cctools-7.13.1/devel/apps/wq_bwa_json/create_splits.py
===================================================================
--- cctools-7.13.1.orig/devel/apps/wq_bwa_json/create_splits.py
+++ cctools-7.13.1/devel/apps/wq_bwa_json/create_splits.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
def create_splits(query):
Index: cctools-7.13.1/devel/umbrella/src/umbrella.py
===================================================================
--- cctools-7.13.1.orig/devel/umbrella/src/umbrella.py
+++ cctools-7.13.1/devel/umbrella/src/umbrella.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
# All the vanilla python package dependencies of Umbrella can be satisfied by a standard installation of Python 2.{6,7} or Python 3.
"""
@@ -2112,7 +2112,7 @@ def condor_process(spec_path, spec_json,
condor_submit_file = open(condor_submit_path, "w+")
condor_submit_file.write('universe = vanilla\n')
- condor_submit_file.write('executable = %s\n' % '/usr/bin/python')
+ condor_submit_file.write('executable = %s\n' % '/usr/bin/python3')
if cvmfs_http_proxy:
condor_submit_file.write('arguments = "./umbrella -s local --spec %s --cvmfs_http_proxy %s --meta %s -l condor_umbrella -i \'%s\' -o %s --log condor_umbrella.log run \'%s\'"\n' % (spec_path_basename, cvmfs_http_proxy, os.path.basename(meta_path), new_input_options, os.path.basename(condor_output_dir), user_cmd[0]))
else:
|