Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

specify python3 #6363

Merged
merged 4 commits into from
Dec 1, 2023
Merged

specify python3 #6363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f2b4c1
specify python3
jburel Sep 22, 2023
40551df
use python3
jburel Sep 22, 2023
3df835e
use python3
jburel Sep 22, 2023
9d92341
change executable to python3
jburel Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"/>
Expand Down
4 changes: 2 additions & 2 deletions components/antlib/resources/global.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"/>
Expand All @@ -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"/>
Expand Down
2 changes: 1 addition & 1 deletion components/tools/python.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions docs/hudson/OMERO.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down