Skip to content

Commit

Permalink
Remove iEverest
Browse files Browse the repository at this point in the history
  • Loading branch information
frode-aarstad committed Oct 30, 2024
1 parent 9817d75 commit 65d92fc
Show file tree
Hide file tree
Showing 35 changed files with 9 additions and 2,581 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test_ert.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
if: inputs.test-type == 'unit-tests'
run: |
pytest --cov=ert --cov-report=xml:cov1.xml --junit-xml=junit.xml -o junit_family=legacy -n logical --show-capture=stderr -v --benchmark-disable --mpl --dist loadgroup tests/ert/unit_tests
pytest --doctest-modules --cov=ert --cov-report=xml:cov2.xml src/ --ignore src/ert/dark_storage --ignore src/ieverest
pytest --doctest-modules --cov=ert --cov-report=xml:cov2.xml src/ --ignore src/ert/dark_storage
- name: Performance Test
if: inputs.test-type == 'performance-tests'
Expand Down
11 changes: 2 additions & 9 deletions .github/workflows/test_everest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ jobs:
- name: Run Tests Linux
if: ${{ inputs.test-type == 'test' && runner.os != 'macOS'}}
run: |
pytest tests/everest -n 4 -m "not ui_test and not integration_test" --dist loadgroup -sv
pytest tests/everest -n 4 -m "not integration_test" --dist loadgroup -sv
- name: Run Tests macOS
if: ${{ inputs.test-type == 'test' && runner.os == 'macOS'}}
run: |
python -m pytest tests/everest -n 4 -m "not ui_test and not integration_test and not fails_on_macos_github_workflow" --dist loadgroup -sv
python -m pytest tests/everest -n 4 -m "not integration_test and not fails_on_macos_github_workflow" --dist loadgroup -sv
- name: Run Integration Tests Linux
if: ${{inputs.test-type == 'integration-test' && runner.os != 'macOS'}}
Expand All @@ -61,13 +61,6 @@ jobs:
run: |
python -m pytest tests/everest -n 4 -m "integration_test and not fails_on_macos_github_workflow" --dist loadgroup
- name: Run UI Tests
if: inputs.test-type == 'ui-test'
env:
QT_QPA_PLATFORM: 'minimal'
run: |
python -m pytest tests/everest -m "ui_test"
- name: Build Documentation
if: inputs.test-type == 'doc'
run: |
Expand Down
3 changes: 0 additions & 3 deletions .mypy.ini
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,3 @@ disable_error_code = dict-item,

[mypy-tests.*]
disable_error_code = no-untyped-def, no-untyped-call, typeddict-item, assignment

[mypy-ieverest.*]
ignore_errors = True
4 changes: 2 additions & 2 deletions ci/testkomodo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ run_ert_with_opm () {
run_everest_tests () {
python -m pytest tests/everest -s \
--ignore-glob "*test_visualization_entry*" \
-m "not requires_eclipse and not ui_test"
xvfb-run -s "-screen 0 640x480x24" --auto-servernum python -m pytest tests/everest -s -m "ui_test"
-m "not requires_eclipse"
xvfb-run -s "-screen 0 640x480x24" --auto-servernum python -m pytest tests/everest -s
}

start_tests () {
Expand Down
10 changes: 0 additions & 10 deletions docs/everest/cli.rst
Original file line number Diff line number Diff line change
Expand Up @@ -153,16 +153,6 @@ Everest `render`
:prog: config_dump_entry


===================
Graphical interface
===================

.. argparse::
:module: ieverest.bin.ieverest_script
:func: _build_args_parser
:prog: ieverest_entry


.. _ev_branch:

==============
Expand Down
2 changes: 0 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ platforms = ["all"]

[tool.setuptools.package-data]
everest = ["data/**/*", "*.tmpl", "detached/jobs/everserver"]
ieverest = ["*.ui"]


[tool.pytest.ini_options]
Expand All @@ -176,7 +175,6 @@ markers = [
"slow",
"everest_models_test",
"integration_test",
"ui_test",
"fails_on_macos_github_workflow", # Tests marked fail due to gui-related issues
]
log_cli = "false"
Expand Down
7 changes: 4 additions & 3 deletions src/everest/bin/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
from everest.bin.monitor_script import monitor_entry
from everest.bin.visualization_script import visualization_entry
from everest.util import configure_logger
from ieverest.bin.ieverest_script import ieverest_entry


def _create_dump_action(dumps, extended=False):
Expand Down Expand Up @@ -120,8 +119,10 @@ def kill(self, args):
kill_entry(args)

def gui(self, args):
"""Start the graphical user interface"""
ieverest_entry(args)
"""Start the graphical user interface (Deprecated)"""
print(
"The gui command has been deprecated. Please use the run command instead."
)

def export(self, args):
"""Export data from a completed optimization case"""
Expand Down
4 changes: 0 additions & 4 deletions src/ieverest/__init__.py

This file was deleted.

Empty file removed src/ieverest/bin/__init__.py
Empty file.
58 changes: 0 additions & 58 deletions src/ieverest/bin/ieverest_script.py

This file was deleted.

26 changes: 0 additions & 26 deletions src/ieverest/config_widget.py

This file was deleted.

Loading

0 comments on commit 65d92fc

Please sign in to comment.