Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .github/workflows/engine_pr_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ jobs:
sleep 5 # wait for 5 seconds before check again
done
pytest -xs --doctest-modules --disable-warnings --color=yes openquake/commands openquake/engine
pip install https://wheelhouse.openquake.org/v3/py/pytest_django-4.9.0-py3-none-any.whl
pytest -v openquake/server/tests/test_public_mode.py

server_read_only_mode:
Expand Down Expand Up @@ -139,6 +140,7 @@ jobs:
run: |
source ~/openquake/bin/activate
oq engine --upgrade-db
pip install https://wheelhouse.openquake.org/v3/py/pytest_django-4.9.0-py3-none-any.whl
pytest -v openquake/server/tests/test_read_only_mode.py

server_aelo_mode:
Expand Down Expand Up @@ -172,6 +174,7 @@ jobs:
./openquake/server/manage.py migrate
./openquake/server/manage.py loaddata openquake/server/fixtures/0001_cookie_consent_required_plus_hide_cookie_bar.json
./openquake/server/manage.py collectstatic --noinput
pip install https://wheelhouse.openquake.org/v3/py/pytest_django-4.9.0-py3-none-any.whl
pytest -v openquake/server/tests/test_aelo_mode.py

server_aristotle_mode:
Expand Down Expand Up @@ -212,4 +215,5 @@ jobs:
oq engine --upgrade-db
./openquake/server/manage.py migrate
touch ~/webui-access.log
pip install https://wheelhouse.openquake.org/v3/py/pytest_django-4.9.0-py3-none-any.whl
pytest -v openquake/server/tests/test_aristotle_mode.py
11 changes: 2 additions & 9 deletions .github/workflows/macos_intel_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,20 +93,13 @@ jobs:
run: |
source ~/openquake/bin/activate
cd ~/work/oq-engine/oq-engine
pip3 install https://wheelhouse.openquake.org/v3/py/pytest_django-4.9.0-py3-none-any.whl
OQ_APPLICATION_MODE=PUBLIC pytest -v openquake/server/tests/test_public_mode.py

- name: Run tests for the engine server in read-only mode to test installation
if: always()
run: |
source ~/openquake/bin/activate
cd ~/work/oq-engine/oq-engine
pip3 install https://wheelhouse.openquake.org/v3/py/pytest_django-4.9.0-py3-none-any.whl
OQ_APPLICATION_MODE=READ_ONLY pytest -v openquake/server/tests/test_read_only_mode.py

# NOTE: we shouldn't need to install the engine in AELO mode on mac
# - name: Run tests for the engine server in aelo mode to test installation
# if: always()
# run: |
# source ~/openquake/bin/activate
# cd ~/work/oq-engine/oq-engine
# -v 2 also logs the test names
# OQ_APPLICATION_MODE=AELO OQ_CONFIG_FILE=openquake/server/tests/data/openquake.cfg ./openquake/server/manage.py test -v 2 tests.test_aelo_mode
2 changes: 2 additions & 0 deletions .github/workflows/macos_m1_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,15 @@ jobs:
run: |
source ~/openquake/bin/activate
cd /Users/runner/runner-isolation/actions-runner/_work/oq-engine/oq-engine/
pip3 install https://wheelhouse.openquake.org/v3/py/pytest_django-4.9.0-py3-none-any.whl
OQ_APPLICATION_MODE=PUBLIC pytest -v openquake/server/tests/test_public_mode.py

- name: Run tests for the engine server in read-only mode to test installation
if: always()
run: |
source ~/openquake/bin/activate
cd /Users/runner/runner-isolation/actions-runner/_work/oq-engine/oq-engine/
pip3 install https://wheelhouse.openquake.org/v3/py/pytest_django-4.9.0-py3-none-any.whl
OQ_APPLICATION_MODE=READ_ONLY pytest -v openquake/server/tests/test_read_only_mode.py

# NB: the demos are tested on linux; there is no reason a demo should
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/windows_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ jobs:
sleep 10
cd D:\a\oq-engine\oq-engine
$Env:OQ_APPLICATION_MODE='PUBLIC'
python -m pip install https://wheelhouse.openquake.org/v3/py/pytest_django-4.9.0-py3-none-any.whl
pytest -v openquake\server\tests\test_public_mode.py

- name: Run tests for the engine server in read-only mode to test installation
Expand All @@ -133,6 +134,7 @@ jobs:
sleep 10
cd D:\a\oq-engine\oq-engine
$Env:OQ_APPLICATION_MODE='READ_ONLY'
python -m pip install https://wheelhouse.openquake.org/v3/py/pytest_django-4.9.0-py3-none-any.whl
pytest -v openquake\server\tests\test_read_only_mode.py

- name: Run all demos
Expand Down
30 changes: 0 additions & 30 deletions conftest.py

This file was deleted.

1 change: 0 additions & 1 deletion requirements-py310-linux64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,3 @@ https://wheelhouse.openquake.org/v3/py/zipp-3.17.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pluggy-1.5.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest-8.3.3-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/django_appconf-1.0.6-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest_django-4.9.0-py3-none-any.whl
1 change: 0 additions & 1 deletion requirements-py310-macos_arm64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,3 @@ https://wheelhouse.openquake.org/v3/py/zipp-3.17.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pluggy-1.5.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest-8.3.3-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/django_appconf-1.0.6-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest_django-4.9.0-py3-none-any.whl
1 change: 0 additions & 1 deletion requirements-py310-macos_x86_64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,3 @@ https://wheelhouse.openquake.org/v3/py/zipp-3.17.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pluggy-1.5.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest-8.3.3-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/django_appconf-1.0.6-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest_django-4.9.0-py3-none-any.whl
1 change: 0 additions & 1 deletion requirements-py310-win64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,3 @@ https://wheelhouse.openquake.org/v3/py/zipp-3.17.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pluggy-1.5.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest-8.3.3-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/django_appconf-1.0.6-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest_django-4.9.0-py3-none-any.whl
1 change: 0 additions & 1 deletion requirements-py311-linux64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,3 @@ https://wheelhouse.openquake.org/v3/py/zipp-3.17.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pluggy-1.5.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest-8.3.3-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/django_appconf-1.0.6-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest_django-4.9.0-py3-none-any.whl
1 change: 0 additions & 1 deletion requirements-py311-macos_arm64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,3 @@ https://wheelhouse.openquake.org/v3/py/zipp-3.17.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pluggy-1.5.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest-8.3.3-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/django_appconf-1.0.6-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest_django-4.9.0-py3-none-any.whl
1 change: 0 additions & 1 deletion requirements-py311-macos_x86_64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,3 @@ https://wheelhouse.openquake.org/v3/py/zipp-3.17.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pluggy-1.5.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest-8.3.3-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/django_appconf-1.0.6-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest_django-4.9.0-py3-none-any.whl
1 change: 0 additions & 1 deletion requirements-py311-win64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,3 @@ https://wheelhouse.openquake.org/v3/py/zipp-3.17.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pluggy-1.5.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest-8.3.3-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/django_appconf-1.0.6-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest_django-4.9.0-py3-none-any.whl
1 change: 0 additions & 1 deletion requirements-py312-linux64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,3 @@ https://wheelhouse.openquake.org/v3/py/zipp-3.17.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pluggy-1.5.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest-8.3.3-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/django_appconf-1.0.6-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest_django-4.9.0-py3-none-any.whl
1 change: 0 additions & 1 deletion requirements-py312-macos_arm64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,3 @@ https://wheelhouse.openquake.org/v3/py/zipp-3.17.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pluggy-1.5.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest-8.3.3-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/django_appconf-1.0.6-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest_django-4.9.0-py3-none-any.whl
1 change: 0 additions & 1 deletion requirements-py312-macos_x86_64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,3 @@ https://wheelhouse.openquake.org/v3/py/zipp-3.17.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pluggy-1.5.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest-8.3.3-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/django_appconf-1.0.6-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest_django-4.9.0-py3-none-any.whl
1 change: 0 additions & 1 deletion requirements-py312-win64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,3 @@ https://wheelhouse.openquake.org/v3/py/zipp-3.17.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pluggy-1.5.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest-8.3.3-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/django_appconf-1.0.6-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest_django-4.9.0-py3-none-any.whl