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.

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

Merge Everest into ert #8709

Merged
merged 93 commits into from
Sep 19, 2024
Merged
Changes from 1 commit
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
6197cf5
Inital commit
May 2, 2024
6083043
Pin ropt dependencies (#6)
verveerpj May 7, 2024
15593bc
Use refactored ropt plugin code (#5)
verveerpj May 8, 2024
481567d
Avoid setting requirements using a beta tag of Ert
andreas-el May 15, 2024
b2e3e05
Missed instance of job_progress.jobs (#9)
DanSava May 16, 2024
7cb9c20
Ensure site-config is active when making ert config (#12)
berland May 27, 2024
4d58fa0
Add enabled option to controls to allow fixing them
verveerpj May 30, 2024
f9c8a50
Enforce server and simulations are running on the same queue
DanSava May 30, 2024
238f2b9
Extend ert queue options with everest options instead of overwriting all
larsevj May 31, 2024
42b2553
Updates for ropt 0.4.0
verveerpj Jun 6, 2024
c7b670f
Only use ruff and pylint for style and linting
larsevj Jun 3, 2024
560737c
Remove rms config plugin
larsevj Jun 13, 2024
b17b588
Add C4 and NPY to ruff rules
larsevj Jun 13, 2024
69a4c39
Fix parts of the mypy errors
larsevj Jun 13, 2024
4e0d141
Small additional mypy fixes
verveerpj Jun 13, 2024
192deb9
Add file with perturbation results
verveerpj Jun 6, 2024
471d4c5
Update to new ert api
oyvindeide Jun 19, 2024
48dac86
Remove dependency on LibreFacade where it was not strictly necessary.
DanSava Jun 20, 2024
ec348af
Lessen dependency on ert config if not needed
DanSava Jun 21, 2024
7624891
Use Erts feature toggling for Scheduler
berland Jun 25, 2024
039ce1b
Accept the new everest-models hook for linting forward models
sregales-TNO Jun 20, 2024
da10415
Fix typo successfully
berland Jun 25, 2024
8796029
Handle case for no local DNS properly
berland Jun 25, 2024
ea11841
Fix how everest handels everest-models plugin hook
sregales-TNO Jun 26, 2024
4a34069
Use running instead if isRunning
oyvindeide Jun 27, 2024
d1829f9
Use self
oyvindeide Jun 27, 2024
76e32b3
Use top level import for moved ert exports
eivindjahren Jun 27, 2024
ce81fd2
Create control variale with inital guess as a list
sregales-TNO Jan 30, 2024
92888b9
Add the newly created control variable to control config
sregales-TNO Feb 6, 2024
06bb880
Refactor control config
sregales-TNO Feb 8, 2024
2d6edd0
Introduce initial_guess list control variable to controls
sregales-TNO Feb 8, 2024
efb1ab3
Use build in hash and unique function to check for duplicates
sregales-TNO Feb 12, 2024
26f8141
Integrate the new Everest array configuration feature
sregales-TNO Jun 27, 2024
d4289d4
Update everest config documentation
sregales-TNO Jun 27, 2024
77413e5
Fix bug in index numbering for input constraints
verveerpj Jul 1, 2024
5206597
Adapt to ert plugin forward models
Jul 8, 2024
793af39
Remove dependency on ert's internal fmsteps
Jul 12, 2024
345d771
Update to ropt 0.5
verveerpj Jul 19, 2024
92e7f0d
Do not used deprecated feature toggle
eivindjahren Jul 24, 2024
b409f38
Updating the theme and the toc
roliveira Jul 25, 2024
804af8d
Make Everest independent of everest-models
DanSava Jul 31, 2024
7228e0f
Auto-generate documentation for the CLI
DanSava Aug 1, 2024
ecd6801
Remove no longer needed folder switching.
DanSava Aug 29, 2024
75d4ce8
Update everest architecture_design.png
DanSava Aug 30, 2024
3e88431
Fixup wrong variable naming
yngve-sk Sep 2, 2024
35da18e
Remove linting logic used in old config.
DanSava Sep 2, 2024
78f7cab
Remove typos and make minor changes in docs
heytorsf Aug 26, 2024
9993cbd
Move to src/ structure
frode-aarstad Sep 2, 2024
9f8c496
Rename everest2res to everest_to_ert_config
DanSava Sep 3, 2024
e653b54
Remove app_main_window no longer used.
DanSava Sep 3, 2024
a7adc56
Add tests for QtDialogsOut
frode-aarstad Sep 3, 2024
12030ee
Add test code coverage
DanSava Sep 3, 2024
7ec17ec
Remove import of ert.JobStatus (#62)
jonathan-eq Sep 4, 2024
7c6420f
Add test for ieverest_entry
DanSava Sep 4, 2024
acf2c49
Add tests for export data dialog
frode-aarstad Sep 4, 2024
b50a66e
Handel no more direct access to ensemble by name from storage.
DanSava Sep 5, 2024
089d2d0
Refactor ropt code
verveerpj Sep 6, 2024
bc04c25
Add snapshot test
frode-aarstad Sep 5, 2024
77dfe8a
Remove _0 from objective function names
Sep 9, 2024
47fcb80
Remove _0 from controls, input constraints, forward models
Sep 9, 2024
7e3460c
Remove report step from docs and examples
Sep 9, 2024
14819ee
Update controls for math multiobj (ref @verveerpj)
Sep 3, 2024
eee3b58
Rename rf_0 to rf
larsevj Sep 10, 2024
fd0bf63
Remove remnants of _0 from docs and comments
larsevj Sep 10, 2024
3385a33
Pin ert
frode-aarstad Sep 11, 2024
e1e698f
Change tmp dir for egg snapshot test
frode-aarstad Sep 10, 2024
52407b6
Update tests/test_egg_simulation.py
frode-aarstad Sep 11, 2024
7f3339d
Add monkeypatch
frode-aarstad Sep 11, 2024
871100c
Fix egg snapshot test
frode-aarstad Sep 11, 2024
c98b767
Set ert to >= 11.0.0b1
Sep 11, 2024
bc1870a
Apply autostyling test_egg_simulation.py
Sep 11, 2024
d0a264f
Update snapshot
frode-aarstad Sep 11, 2024
5078234
Move tests to everest sub folder
oyvindeide Sep 9, 2024
e551118
Use ruff instead of pylint
oyvindeide Sep 10, 2024
bae7a53
Fix pylint: F841
oyvindeide Sep 10, 2024
935a8f6
Fix pylint: PLR6104
oyvindeide Sep 10, 2024
d4ecf86
Fix pylint: PLC1901
oyvindeide Sep 10, 2024
21807b3
Fix pylint: PLW1514
oyvindeide Sep 10, 2024
cbb4fcb
Ignore ruff rules
oyvindeide Sep 10, 2024
9a87146
Fix ruff: SIM115
oyvindeide Sep 10, 2024
5e7630f
Fix ruff: PLC0206
oyvindeide Sep 10, 2024
f27bc4e
Fix ruff: PLC0206
oyvindeide Sep 10, 2024
611dceb
Replace capture_logger with caplog
oyvindeide Sep 12, 2024
7698f6c
Preserve config order when using branch entry
DanSava Sep 10, 2024
ae596bf
Rename docs folder
oyvindeide Sep 16, 2024
321ce26
Simplify everserver setup
oyvindeide Sep 13, 2024
821bf70
Move ert docs into subfolder
oyvindeide Sep 17, 2024
06f4c18
Merge Everest into ert
oyvindeide Sep 17, 2024
955c3ad
Fix docs entry point
oyvindeide Sep 18, 2024
2f4c464
Update version check
oyvindeide Sep 17, 2024
3c38d46
Run ert style on Everest
oyvindeide Sep 17, 2024
0a6db89
Run ert typing on everest
oyvindeide Sep 18, 2024
31ecc09
Compresss ecl-files
oyvindeide Sep 19, 2024
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
Prev Previous commit
Next Next commit
Fix ruff: PLC0206
oyvindeide committed Sep 19, 2024
commit f27bc4eeb8821c798c49da984579fa0246d98aac
4 changes: 2 additions & 2 deletions src/everest/docs/generate_docs_from_config_spec.py
Original file line number Diff line number Diff line change
@@ -68,9 +68,9 @@ def parse_field_info(field_infos: Dict[str, FieldInfo]):
subfields = model_field.annotation.model_fields
parsed_subfields = parse_field_info(subfields)
elif "everest.config" in str(model_field.annotation):
for cls_name in CONFIGS:
for cls_name, value in CONFIGS.items():
if cls_name in annotation:
subfields = CONFIGS[cls_name].model_fields
subfields = value.model_fields
annotation = re.sub(
r"List\[(.*)\.(\w+)\]", r"List[\2]", annotation
)