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

Remove deprecated usage of pytest-runner #68

Merged
merged 1 commit into from
Jan 31, 2024
Merged

Remove deprecated usage of pytest-runner #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 app-build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion cli-build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 2 additions & 3 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion scripts-build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading