diff --git a/home/jobs/BIOFORMATS-build/config.xml b/home/jobs/BIOFORMATS-build/config.xml index 74991e48..88bc4381 100644 --- a/home/jobs/BIOFORMATS-build/config.xml +++ b/home/jobs/BIOFORMATS-build/config.xml @@ -73,7 +73,7 @@ - python3 -mvenv venv + python3.11 -mvenv venv source $WORKSPACE/venv/bin/activate cd bio-formats-build diff --git a/home/jobs/BIOFORMATS-push/config.xml b/home/jobs/BIOFORMATS-push/config.xml index 67b1da5e..728ff2a3 100644 --- a/home/jobs/BIOFORMATS-push/config.xml +++ b/home/jobs/BIOFORMATS-push/config.xml @@ -72,7 +72,7 @@ false - python3 -mvenv venv + python3.11 -mvenv venv source $WORKSPACE/venv/bin/activate pip install -U pip pip install -U scc diff --git a/home/jobs/OMERO-build/config.xml b/home/jobs/OMERO-build/config.xml index 90df658c..04d88c36 100644 --- a/home/jobs/OMERO-build/config.xml +++ b/home/jobs/OMERO-build/config.xml @@ -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 'setuptools<66' omero-py +source $OMERO_VEN/bin/activate source docs/hudson/OMERO.sh diff --git a/home/jobs/OMERO-docs/config.xml b/home/jobs/OMERO-docs/config.xml index bfc37c6b..9949b856 100644 --- a/home/jobs/OMERO-docs/config.xml +++ b/home/jobs/OMERO-docs/config.xml @@ -61,7 +61,7 @@ false - python3 -mvenv venv + python3.11 -mvenv venv source $WORKSPACE/venv/bin/activate pip install -U pip pip install -U scc diff --git a/home/jobs/OMERO-push/config.xml b/home/jobs/OMERO-push/config.xml index b0c258d6..efab0947 100644 --- a/home/jobs/OMERO-push/config.xml +++ b/home/jobs/OMERO-push/config.xml @@ -85,7 +85,7 @@ false - python3 -mvenv venv + python3.11 -mvenv venv source $WORKSPACE/venv/bin/activate pip install -U pip pip install -U scc diff --git a/home/jobs/OMERO-robot/config.xml b/home/jobs/OMERO-robot/config.xml index b564e608..373a47a2 100644 --- a/home/jobs/OMERO-robot/config.xml +++ b/home/jobs/OMERO-robot/config.xml @@ -55,11 +55,11 @@ 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. diff --git a/home/jobs/OMERO-server/config.xml b/home/jobs/OMERO-server/config.xml index 740dcc22..5cbe66ae 100644 --- a/home/jobs/OMERO-server/config.xml +++ b/home/jobs/OMERO-server/config.xml @@ -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" @@ -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 diff --git a/home/jobs/OMERO-test-integration/config.xml b/home/jobs/OMERO-test-integration/config.xml index dd480de5..4fefcac2 100644 --- a/home/jobs/OMERO-test-integration/config.xml +++ b/home/jobs/OMERO-test-integration/config.xml @@ -15,11 +15,11 @@ 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 diff --git a/home/jobs/OMERO-training/config.xml b/home/jobs/OMERO-training/config.xml index 9e265d4c..e41a118e 100644 --- a/home/jobs/OMERO-training/config.xml +++ b/home/jobs/OMERO-training/config.xml @@ -15,11 +15,11 @@ 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 diff --git a/home/jobs/OMERO-web/config.xml b/home/jobs/OMERO-web/config.xml index 6c479d3a..bcc6c06f 100644 --- a/home/jobs/OMERO-web/config.xml +++ b/home/jobs/OMERO-web/config.xml @@ -26,11 +26,11 @@ 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 diff --git a/server/Dockerfile b/server/Dockerfile index 3290deb1..d13129e2 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -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)' && \ diff --git a/slave/Dockerfile b/slave/Dockerfile index 9aa7052d..9ac6298a 100644 --- a/slave/Dockerfile +++ b/slave/Dockerfile @@ -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)' && \ diff --git a/web/Dockerfile b/web/Dockerfile index daed2cd7..9d807f98 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -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