Remove deprecated usage of pytest-runner

- Call pytest directly in app, cli and scripts builds - Remove pytest-runner - Uncap pytest and install pytest-mock by default
ome · Jan 28, 2024 · 7bb276d · 7bb276d
1 parent 3824e85
commit 7bb276d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/app-build b/app-build
@@ -17,4 +17,4 @@ set +u
 export DJANGO_SETTINGS_MODULE=omeroweb.settings
 export OMERODIR=/opt/omero/web/OMERO.web
 export ICE_CONFIG=${OMERO_DIST}/etc/ice.config
-python $DIR/setup.py test
+pytest -v
diff --git a/cli-build b/cli-build
@@ -14,4 +14,5 @@ PLUGIN=${PLUGIN:-$GUESS}
 export OMERO_DIST=${OMERO_DIST:-/opt/omero/server/OMERO.server}
 omero $PLUGIN -h
 
-python setup.py test -t test -i ${OMERO_DIST}/etc/ice.config -vs
+export ICE_CONFIG=${OMERO_DIST}/etc/ice.config
+pytest -v
diff --git a/requirements.txt b/requirements.txt
@@ -4,10 +4,9 @@ pep8-naming
 pre-commit
 pycodestyle
 restructuredtext_lint
-pytest<5
+pytest
 attrs
 restview
-mox
+pytest-mock
 # TODO: Apps only
 pytest-django
-pytest-runner
diff --git a/scripts-build b/scripts-build
@@ -8,4 +8,5 @@ set -x
 
 cd $TARGET
 
-python setup.py test -t test -i ${OMERO_DIST}/etc/ice.config -v
+export ICE_CONFIG=${OMERO_DIST}/etc/ice.config
+pytest -v