From 0710367829f1afb8a2049e9cac7ea48ccd6bd8de Mon Sep 17 00:00:00 2001 From: Simon Li Date: Mon, 17 Aug 2020 16:13:05 +0100 Subject: [PATCH] Pin psutil<2 to avoid psutil dependency See https://github.com/pytest-dev/pytest-xdist/issues/585 --- home/jobs/OMERO-test-integration/config.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/home/jobs/OMERO-test-integration/config.xml b/home/jobs/OMERO-test-integration/config.xml index 0a1f55be..a2954df0 100644 --- a/home/jobs/OMERO-test-integration/config.xml +++ b/home/jobs/OMERO-test-integration/config.xml @@ -21,7 +21,9 @@ source $WORKSPACE/.venv3/bin/activate pip install https://github.com/ome/zeroc-ice-py-centos7/releases/download/0.2.1/zeroc_ice-3.6.5-cp36-cp36m-linux_x86_64.whl pip install -U pip future setuptools pip install markdown -pip install mox3 pytest pytest-django pytest-xdist +# Avoid installing psutil for now +# https://github.com/pytest-dev/pytest-xdist/issues/585 +pip install mox3 pytest pytest-django 'pytest-xdist<2' pip install tables pip install jinja2 pip install PyYAML