Skip to content

Upgrade build containers to Python 3.11 #220

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

Merged
jburel merged 7 commits into from
Apr 4, 2025
Merged

Upgrade build containers to Python 3.11 #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1348823
Install Python 3.11 in the base Docker images
sbesson Mar 25, 2025
1f2ab3f
Update job configuration to create Python 3.11 environments
sbesson Mar 25, 2025
75e1cc9
Use versioned pip executable
sbesson Mar 25, 2025
6120275
Update robot job
jburel Mar 27, 2025
08fb36d
Activate the virtual environment before building OMERO
sbesson Mar 28, 2025
98a582c
Delete the env
jburel Mar 28, 2025
2191ed9
cap setuptools
jburel Mar 28, 2025
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 home/jobs/BIOFORMATS-build/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
</axes>
<builders>
<hudson.tasks.Shell>
<command>python3 -mvenv venv
<command>python3.11 -mvenv venv
source $WORKSPACE/venv/bin/activate

cd bio-formats-build
Expand Down
2 changes: 1 addition & 1 deletion home/jobs/BIOFORMATS-push/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<concurrentBuild>false</concurrentBuild>
<builders>
<hudson.tasks.Shell>
<command>python3 -mvenv venv
<command>python3.11 -mvenv venv
source $WORKSPACE/venv/bin/activate
pip install -U pip
pip install -U scc
Expand Down
9 changes: 5 additions & 4 deletions home/jobs/OMERO-build/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,13 @@ cd src
export OMERO_BRANCH=$MERGE_PUSH_BRANCH

OMERO_VEN=$WORKSPACE/omero-virtualenv

rm -rf $OMERO_VEN
source $HOME/settings.env
python3 -m venv $OMERO_VEN
python3.11 -m venv $OMERO_VEN

$OMERO_VEN/bin/pip install https://github.com/glencoesoftware/zeroc-ice-py-rhel9-x86_64/releases/download/20230830/zeroc_ice-3.6.5-cp39-cp39-linux_x86_64.whl
$OMERO_VEN/bin/pip install -U setuptools omero-py
$OMERO_VEN/bin/pip install https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20240202/zeroc_ice-3.6.5-cp311-cp311-manylinux_2_28_x86_64.whl
$OMERO_VEN/bin/pip install -U &apos;setuptools&#60;66&apos; omero-py
source $OMERO_VEN/bin/activate
source docs/hudson/OMERO.sh
</command>
</hudson.tasks.Shell>
Expand Down
2 changes: 1 addition & 1 deletion home/jobs/OMERO-docs/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<concurrentBuild>false</concurrentBuild>
<builders>
<hudson.tasks.Shell>
<command>python3 -mvenv venv
<command>python3.11 -mvenv venv
source $WORKSPACE/venv/bin/activate
pip install -U pip
pip install -U scc
Expand Down
2 changes: 1 addition & 1 deletion home/jobs/OMERO-push/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
<doNotFingerprintArtifacts>false</doNotFingerprintArtifacts>
</hudson.plugins.copyartifact.CopyArtifact>
<hudson.tasks.Shell>
<command>python3 -mvenv venv
<command>python3.11 -mvenv venv
source $WORKSPACE/venv/bin/activate
pip install -U pip
pip install -U scc
Expand Down
6 changes: 3 additions & 3 deletions home/jobs/OMERO-robot/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@
<hudson.tasks.Shell>
<command>
rm -rf $WORKSPACE/.venv3
python -m venv $WORKSPACE/.venv3
python3.11 -m venv $WORKSPACE/.venv3

source $WORKSPACE/.venv3/bin/activate
pip install https://github.com/glencoesoftware/zeroc-ice-py-rhel9-x86_64/releases/download/20230830/zeroc_ice-3.6.5-cp39-cp39-linux_x86_64.whl
pip install -U pip future setuptools
pip install -U pip setuptools
pip install https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20240202/zeroc_ice-3.6.5-cp311-cp311-manylinux_2_28_x86_64.whl
pip install omero-py omero-web # Latest in order to stop server.
</command>
</hudson.tasks.Shell>
Expand Down
6 changes: 3 additions & 3 deletions home/jobs/OMERO-server/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ if [ -e $OMERO_DIST ]; then
fi

rm -rf $WORKSPACE/.venv3
python3 -m venv $WORKSPACE/.venv3
python3.11 -m venv $WORKSPACE/.venv3

if [ "$PURGE_DATA" = "true" ]; then
dropdb -h $OMERO_DB_HOST -U $OMERO_DB_USER $OMERO_DB_NAME || echo "First run or already exists"
Expand Down Expand Up @@ -123,8 +123,8 @@ mv $WORKSPACE/$DIST $OMERO_DIST

source $WORKSPACE/.venv3/bin/activate

pip install https://github.com/glencoesoftware/zeroc-ice-py-rhel9-x86_64/releases/download/20230830/zeroc_ice-3.6.5-cp39-cp39-linux_x86_64.whl
pip install -U pip future
pip install -U pip
pip install https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20240202/zeroc_ice-3.6.5-cp311-cp311-manylinux_2_28_x86_64.whl
pip install markdown
pip install reportlab # For figure
pip install omego
Expand Down
6 changes: 3 additions & 3 deletions home/jobs/OMERO-test-integration/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<builders>
<hudson.tasks.Shell>
<command>rm -rf $WORKSPACE/.venv3
python3 -m venv $WORKSPACE/.venv3
python3.11 -m venv $WORKSPACE/.venv3

source $WORKSPACE/.venv3/bin/activate
pip install https://github.com/glencoesoftware/zeroc-ice-py-rhel9-x86_64/releases/download/20230830/zeroc_ice-3.6.5-cp39-cp39-linux_x86_64.whl
pip install -U pip future setuptools
pip install -U pip setuptools
pip install https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20240202/zeroc_ice-3.6.5-cp311-cp311-manylinux_2_28_x86_64.whl
pip install markdown
pip install mox3 pytest pytest-django pytest-xdist pytest-mock
pip install tables
Expand Down
6 changes: 3 additions & 3 deletions home/jobs/OMERO-training/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<builders>
<hudson.tasks.Shell>
<command>rm -rf $WORKSPACE/.venv3
python3 -m venv $WORKSPACE/.venv3
python3.11 -m venv $WORKSPACE/.venv3

source $WORKSPACE/.venv3/bin/activate
pip install https://github.com/glencoesoftware/zeroc-ice-py-rhel9-x86_64/releases/download/20230830/zeroc_ice-3.6.5-cp39-cp39-linux_x86_64.whl
pip install -U pip future setuptools
pip install -U pip setuptools
pip install https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20240202/zeroc_ice-3.6.5-cp311-cp311-manylinux_2_28_x86_64.whl
pip install markdown
# Avoid installing psutil for now
# https://github.com/pytest-dev/pytest-xdist/issues/585
Expand Down
6 changes: 3 additions & 3 deletions home/jobs/OMERO-web/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
<builders>
<hudson.tasks.Shell>
<command>rm -rf $WORKSPACE/.venv3
python3 -m venv $WORKSPACE/.venv3
python3.11 -m venv $WORKSPACE/.venv3

source $WORKSPACE/.venv3/bin/activate
pip install https://github.com/glencoesoftware/zeroc-ice-py-rhel9-x86_64/releases/download/20230830/zeroc_ice-3.6.5-cp39-cp39-linux_x86_64.whl
pip install -U pip future
pip install -U pip
pip install https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20240202/zeroc_ice-3.6.5-cp311-cp311-manylinux_2_28_x86_64.whl
pip install markdown
pip install omero-py omero-web # Latest in order to stop server. NB: Re-installed from python-superbuild below</command>
</hudson.tasks.Shell>
Expand Down
4 changes: 2 additions & 2 deletions server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ RUN chmod +x /home/settings.env
WORKDIR /tmp/omero-install/linux


RUN dnf install -y python3 python3-pip
RUN pip install build
RUN dnf install -y python3.11 python3.11-pip
RUN pip3.11 install build

# Ice dependencies
RUN dnf install -y 'dnf-command(config-manager)' && \
Expand Down
4 changes: 2 additions & 2 deletions slave/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ RUN chmod +x /home/settings.env
RUN dnf install -y make

# Python job
RUN dnf install -y python3-setuptools python3-pip
RUN pip install build
RUN dnf install -y python3.11 python3.11-pip
RUN pip3.11 install build

# Ice dependencies
RUN dnf install -y 'dnf-command(config-manager)' && \
Expand Down
4 changes: 2 additions & 2 deletions web/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ ADD ./run.sh /tmp/run.sh
RUN chown omero:omero /tmp/run.sh
RUN chmod a+x /tmp/run.sh

RUN dnf install -y python3 openssl python3-pip
RUN pip install build
RUN dnf install -y python3.11 openssl python3.11-pip
RUN pip3.11 install build

RUN dnf clean all

Expand Down
Loading