Merge pull request #6363 from jburel/python3

specify python3
ome · Dec 1, 2023 · 6a2adc4 · 6a2adc4
2 parents 2db65a9 + 9d92341
commit 6a2adc4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/build.xml b/build.xml
@@ -255,7 +255,7 @@ To get started using Eclipse, execute "ant build-dev" and import the top-level
     <target name="release-src-git" description="Package the git source tree (git)"
             depends="check-git" if="git.exists">
         <mkdir dir="${target.dir}"/>
-        <exec executable="python" failonerror="true">
+        <exec executable="python3" failonerror="true">
             <arg value="${omero.home}/components/antlib/scripts/source-archive.py"/>
             <arg value="openmicroscopy"/>
             <arg value="${omero.shortversion}"/>

diff --git a/components/antlib/resources/global.xml b/components/antlib/resources/global.xml
@@ -451,7 +451,7 @@
                 <echo>Building with SLICE2CPP=${ice.slice2cpp}</echo>
                 <echo>Building with SLICE2HTML=${ice.slice2html}</echo>
                 <echo>Building with SLICEPATH=${ice.slicepath}</echo>
-                <exec executable="python" dir="@{dir}" failonerror="@{failonerror}">
+                <exec executable="python3" dir="@{dir}" failonerror="@{failonerror}">
                     <env key="PYTHONPATH" value="@{pythonpath}"/>
                     <env key="ICE_HOME" value="${ice.home}"/>
                     <env key="SLICE2CPP" value="${ice.slice2cpp}"/>
@@ -470,7 +470,7 @@
             <attribute name="failonerror" default="true"/>
             <element name="args" implicit="true"/>
             <sequential>
-                <exec executable="python" failonerror="@{failonerror}">
+                <exec executable="python3" failonerror="@{failonerror}">
                     <env key="ICE_CONFIG" value="${env.ICE_CONFIG}"/>
                     <env key="PYTHONPATH" path="test:build/lib:${env.PYTHONPATH}"/>
                     <arg value="${basedir}/setup.py"/>

diff --git a/components/tools/python.xml b/components/tools/python.xml
@@ -24,7 +24,7 @@ build_year = "${python_build_year}"
         <attribute name="failonerror" default="true"/>
         <element name="args" implicit="true"/>
         <sequential>
-            <exec executable="python" failonerror="@{failonerror}">
+            <exec executable="python3" failonerror="@{failonerror}">
                 <args/>
             </exec>
         </sequential>

diff --git a/docs/hudson/OMERO.sh b/docs/hudson/OMERO.sh
@@ -12,10 +12,10 @@ set -x
 source docs/hudson/functions.sh
 echo Building $OMERO_BRANCH
 
-./build.py build-dev release-all
+python3 ./build.py build-dev release-all
 if [ -d .git ]
 then
-  ./build.py release-src
+  python3 ./build.py release-src
 fi
 
 # Log information