From 558745b54866e456a52daf55d6cc8b39f7bed387 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 17 Nov 2018 08:12:12 +0100 Subject: [PATCH] explicitly require python3 on older systems, python3 tpyically exists but python2 is the defaul --- PRIVATE | 2 +- installation/symlink_Processing.py | 2 +- processing/post/addCalculation.py | 2 +- processing/post/addCauchy.py | 2 +- processing/post/addCompatibilityMismatch.py | 2 +- processing/post/addCurl.py | 2 +- processing/post/addDeterminant.py | 2 +- processing/post/addDeviator.py | 2 +- processing/post/addDisplacement.py | 2 +- processing/post/addDivergence.py | 2 +- processing/post/addEhkl.py | 2 +- processing/post/addEuclideanDistance.py | 2 +- processing/post/addGaussian.py | 2 +- processing/post/addGradient.py | 2 +- processing/post/addIPFcolor.py | 2 +- processing/post/addIndexed.py | 2 +- processing/post/addMises.py | 2 +- processing/post/addNorm.py | 2 +- processing/post/addOrientations.py | 2 +- processing/post/addPK2.py | 2 +- processing/post/addSchmidfactors.py | 2 +- processing/post/addSpectralDecomposition.py | 2 +- processing/post/addStrainTensors.py | 2 +- processing/post/averageDown.py | 2 +- processing/post/filterTable.py | 2 +- processing/post/perceptualUniformColorMap.py | 2 +- processing/post/permuteData.py | 2 +- processing/post/postResults.py | 2 +- processing/post/reLabel.py | 2 +- processing/post/rotateData.py | 2 +- processing/post/scaleData.py | 2 +- processing/post/shiftData.py | 2 +- processing/post/showTable.py | 2 +- processing/pre/geom_addPrimitive.py | 2 +- processing/pre/geom_canvas.py | 2 +- processing/pre/geom_clean.py | 2 +- processing/pre/geom_fromMinimalSurface.py | 2 +- processing/pre/geom_fromOsteonGeometry.py | 2 +- processing/pre/geom_fromTable.py | 2 +- processing/pre/geom_fromVoronoiTessellation.py | 2 +- processing/pre/geom_mirror.py | 2 +- processing/pre/geom_pack.py | 2 +- processing/pre/geom_renumber.py | 2 +- processing/pre/geom_rescale.py | 2 +- processing/pre/geom_rotate.py | 2 +- processing/pre/geom_translate.py | 2 +- processing/pre/geom_unpack.py | 2 +- processing/pre/geom_vicinityOffset.py | 2 +- processing/pre/hybridIA_linODFsampling.py | 2 +- processing/pre/mentat_spectralBox.py | 2 +- 50 files changed, 50 insertions(+), 50 deletions(-) diff --git a/PRIVATE b/PRIVATE index b46552b0e..923e5eaa2 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit b46552b0e3849415a6c280b2070198246853e310 +Subproject commit 923e5eaa2a24b0ac3b9b66e62394784596643d16 diff --git a/installation/symlink_Processing.py b/installation/symlink_Processing.py index e32701ee6..60f8d3639 100755 --- a/installation/symlink_Processing.py +++ b/installation/symlink_Processing.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- # Makes postprocessing routines acessible from everywhere. diff --git a/processing/post/addCalculation.py b/processing/post/addCalculation.py index 7e49d6385..d19855753 100755 --- a/processing/post/addCalculation.py +++ b/processing/post/addCalculation.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,re,sys,collections diff --git a/processing/post/addCauchy.py b/processing/post/addCauchy.py index 4d2406ce8..3c873f2aa 100755 --- a/processing/post/addCauchy.py +++ b/processing/post/addCauchy.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/addCompatibilityMismatch.py b/processing/post/addCompatibilityMismatch.py index e10273f30..7d2a89fa0 100755 --- a/processing/post/addCompatibilityMismatch.py +++ b/processing/post/addCompatibilityMismatch.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os diff --git a/processing/post/addCurl.py b/processing/post/addCurl.py index 66f185914..cae1ef8b0 100755 --- a/processing/post/addCurl.py +++ b/processing/post/addCurl.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/post/addDeterminant.py b/processing/post/addDeterminant.py index 61f2abb55..b8b177e37 100755 --- a/processing/post/addDeterminant.py +++ b/processing/post/addDeterminant.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/addDeviator.py b/processing/post/addDeviator.py index 485a79122..1f97ca467 100755 --- a/processing/post/addDeviator.py +++ b/processing/post/addDeviator.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/addDisplacement.py b/processing/post/addDisplacement.py index 807a3e9cb..ff9d251f7 100755 --- a/processing/post/addDisplacement.py +++ b/processing/post/addDisplacement.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/post/addDivergence.py b/processing/post/addDivergence.py index a601bd23f..73eb4ed9e 100755 --- a/processing/post/addDivergence.py +++ b/processing/post/addDivergence.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/post/addEhkl.py b/processing/post/addEhkl.py index 86ef97ef7..3cfec69af 100755 --- a/processing/post/addEhkl.py +++ b/processing/post/addEhkl.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/addEuclideanDistance.py b/processing/post/addEuclideanDistance.py index c93ae3536..2e5794e1b 100755 --- a/processing/post/addEuclideanDistance.py +++ b/processing/post/addEuclideanDistance.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,itertools diff --git a/processing/post/addGaussian.py b/processing/post/addGaussian.py index 1a4e2acd7..f468790ef 100755 --- a/processing/post/addGaussian.py +++ b/processing/post/addGaussian.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/addGradient.py b/processing/post/addGradient.py index 19481ea39..676efb27e 100755 --- a/processing/post/addGradient.py +++ b/processing/post/addGradient.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/post/addIPFcolor.py b/processing/post/addIPFcolor.py index a4129a8bf..ffe3dac3f 100755 --- a/processing/post/addIPFcolor.py +++ b/processing/post/addIPFcolor.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/post/addIndexed.py b/processing/post/addIndexed.py index a219c4d80..63206d329 100755 --- a/processing/post/addIndexed.py +++ b/processing/post/addIndexed.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/addMises.py b/processing/post/addMises.py index 26419b74b..55cf6552e 100755 --- a/processing/post/addMises.py +++ b/processing/post/addMises.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/post/addNorm.py b/processing/post/addNorm.py index 3aa9e8c04..f90cd4b31 100755 --- a/processing/post/addNorm.py +++ b/processing/post/addNorm.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/post/addOrientations.py b/processing/post/addOrientations.py index f749c5a09..22fe80c2e 100755 --- a/processing/post/addOrientations.py +++ b/processing/post/addOrientations.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/post/addPK2.py b/processing/post/addPK2.py index aa340e11f..3c615295d 100755 --- a/processing/post/addPK2.py +++ b/processing/post/addPK2.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/addSchmidfactors.py b/processing/post/addSchmidfactors.py index 5c72b47a4..be1d49bbd 100755 --- a/processing/post/addSchmidfactors.py +++ b/processing/post/addSchmidfactors.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/post/addSpectralDecomposition.py b/processing/post/addSpectralDecomposition.py index a34d8d82a..e7d552c70 100755 --- a/processing/post/addSpectralDecomposition.py +++ b/processing/post/addSpectralDecomposition.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/addStrainTensors.py b/processing/post/addStrainTensors.py index ef82efd02..bffc92f9a 100755 --- a/processing/post/addStrainTensors.py +++ b/processing/post/addStrainTensors.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/averageDown.py b/processing/post/averageDown.py index b0faeb2e1..96520a789 100755 --- a/processing/post/averageDown.py +++ b/processing/post/averageDown.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/filterTable.py b/processing/post/filterTable.py index e518dfd1c..865df6c03 100755 --- a/processing/post/filterTable.py +++ b/processing/post/filterTable.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,re,sys,fnmatch diff --git a/processing/post/perceptualUniformColorMap.py b/processing/post/perceptualUniformColorMap.py index e01b144af..b9f31d492 100755 --- a/processing/post/perceptualUniformColorMap.py +++ b/processing/post/perceptualUniformColorMap.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import sys,os diff --git a/processing/post/permuteData.py b/processing/post/permuteData.py index 9669f1b20..1843c9f57 100755 --- a/processing/post/permuteData.py +++ b/processing/post/permuteData.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/postResults.py b/processing/post/postResults.py index 585e60d9c..df0ca8617 100755 --- a/processing/post/postResults.py +++ b/processing/post/postResults.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,math,re,time,struct diff --git a/processing/post/reLabel.py b/processing/post/reLabel.py index e3a58b9c7..0c6ef8dc9 100755 --- a/processing/post/reLabel.py +++ b/processing/post/reLabel.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,re diff --git a/processing/post/rotateData.py b/processing/post/rotateData.py index dd3a3c225..84d4cd3e1 100755 --- a/processing/post/rotateData.py +++ b/processing/post/rotateData.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/post/scaleData.py b/processing/post/scaleData.py index 0b1a48553..381485a8a 100755 --- a/processing/post/scaleData.py +++ b/processing/post/scaleData.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/shiftData.py b/processing/post/shiftData.py index 22b76f7d1..4ad1cbd0d 100755 --- a/processing/post/shiftData.py +++ b/processing/post/shiftData.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/showTable.py b/processing/post/showTable.py index 02946437b..c01bdcddb 100755 --- a/processing/post/showTable.py +++ b/processing/post/showTable.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os diff --git a/processing/pre/geom_addPrimitive.py b/processing/pre/geom_addPrimitive.py index 534d68af1..35000d8bf 100755 --- a/processing/pre/geom_addPrimitive.py +++ b/processing/pre/geom_addPrimitive.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_canvas.py b/processing/pre/geom_canvas.py index 2d0ea3103..db6a82ab2 100755 --- a/processing/pre/geom_canvas.py +++ b/processing/pre/geom_canvas.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_clean.py b/processing/pre/geom_clean.py index 4327f2636..e3fa59dd8 100755 --- a/processing/pre/geom_clean.py +++ b/processing/pre/geom_clean.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_fromMinimalSurface.py b/processing/pre/geom_fromMinimalSurface.py index 03a12682a..002b4800b 100755 --- a/processing/pre/geom_fromMinimalSurface.py +++ b/processing/pre/geom_fromMinimalSurface.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_fromOsteonGeometry.py b/processing/pre/geom_fromOsteonGeometry.py index c1fb9b402..4caffb25f 100755 --- a/processing/pre/geom_fromOsteonGeometry.py +++ b/processing/pre/geom_fromOsteonGeometry.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_fromTable.py b/processing/pre/geom_fromTable.py index 37e78a52f..a2f71d0c9 100755 --- a/processing/pre/geom_fromTable.py +++ b/processing/pre/geom_fromTable.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,math,time diff --git a/processing/pre/geom_fromVoronoiTessellation.py b/processing/pre/geom_fromVoronoiTessellation.py index 79dc29c9e..404e7f000 100755 --- a/processing/pre/geom_fromVoronoiTessellation.py +++ b/processing/pre/geom_fromVoronoiTessellation.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_mirror.py b/processing/pre/geom_mirror.py index 65dbb648d..951fb0842 100755 --- a/processing/pre/geom_mirror.py +++ b/processing/pre/geom_mirror.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_pack.py b/processing/pre/geom_pack.py index 587dabb0b..0d864bbf5 100755 --- a/processing/pre/geom_pack.py +++ b/processing/pre/geom_pack.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/pre/geom_renumber.py b/processing/pre/geom_renumber.py index 5c5240308..033b4a566 100755 --- a/processing/pre/geom_renumber.py +++ b/processing/pre/geom_renumber.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_rescale.py b/processing/pre/geom_rescale.py index c0945a63c..b3716bd62 100755 --- a/processing/pre/geom_rescale.py +++ b/processing/pre/geom_rescale.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_rotate.py b/processing/pre/geom_rotate.py index 8318b366c..939f2b943 100755 --- a/processing/pre/geom_rotate.py +++ b/processing/pre/geom_rotate.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_translate.py b/processing/pre/geom_translate.py index 992e5ead5..59aaac5d5 100755 --- a/processing/pre/geom_translate.py +++ b/processing/pre/geom_translate.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_unpack.py b/processing/pre/geom_unpack.py index 85c60d6e5..726e4ef04 100755 --- a/processing/pre/geom_unpack.py +++ b/processing/pre/geom_unpack.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_vicinityOffset.py b/processing/pre/geom_vicinityOffset.py index 001fa3930..9fce7201a 100755 --- a/processing/pre/geom_vicinityOffset.py +++ b/processing/pre/geom_vicinityOffset.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/hybridIA_linODFsampling.py b/processing/pre/hybridIA_linODFsampling.py index b22be3aca..acedc3cca 100755 --- a/processing/pre/hybridIA_linODFsampling.py +++ b/processing/pre/hybridIA_linODFsampling.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- from optparse import OptionParser diff --git a/processing/pre/mentat_spectralBox.py b/processing/pre/mentat_spectralBox.py index 146f14b34..aa7039e0d 100755 --- a/processing/pre/mentat_spectralBox.py +++ b/processing/pre/mentat_spectralBox.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys