Fix res import errors #2502
Merged
Fix res import errors #2502
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eivindjahren
force-pushed
the
fix_res_imports
branch
22 times, most recently
from
8e53b29
to
7e39367
Compare
eivindjahren
force-pushed
the
fix_res_imports
branch
4 times, most recently
from
4180273
to
be04ee3
Compare
Codecov Report
@@ Coverage Diff @@
## main #2502 +/- ##
==========================================
+ Coverage 63.74% 63.76% +0.02%
==========================================
Files 658 658
Lines 54900 54954 +54
Branches 4393 4393
==========================================
+ Hits 34994 35041 +47
- Misses 18582 18588 +6
- Partials 1324 1325 +1
Continue to review full report at Codecov.
|
eivindjahren
force-pushed
the
fix_res_imports
branch
from
be04ee3
to
331dd9b
Compare
pinkwah
requested changes
Dec 7, 2021
res/sched/history.py
Outdated
| @@ -31,7 +34,7 @@ class History(BaseCClass): | |||
| ) | |||
| _free = ResPrototype("void history_free( history )") | |||
|
|
|||
| def __init__(self, refcase=None, use_history=False, sched_file=None): | |||
| def __init__(self, refcase=Optional[EclSum], use_history=False, sched_file=None): | |||
There was a problem hiding this comment.
Suggested change
| def __init__(self, refcase=Optional[EclSum], use_history=False, sched_file=None): | |
| def __init__(self, refcase: Optional[EclSum] = None, use_history=False, sched_file=None): |
There was a problem hiding this comment.
Oups, nice catch. Fixed
| @@ -54,7 +56,7 @@ def __init__(self, ensemble_config_node, file_system, input_mask=None): | |||
|
|
|||
| self.__load(file_system, input_mask) | |||
|
|
|||
| def __load(self, file_system, input_mask=None): | |||
| def __load(self, file_system: EnkfFs, input_mask: BoolVector = None): | |||
There was a problem hiding this comment.
Suggested change
| def __load(self, file_system: EnkfFs, input_mask: BoolVector = None): | |
| def __load(self, file_system: EnkfFs, input_mask: Optional[BoolVector] = None): |
res/enkf/enkf_state.py
Outdated
| self, fs, param_list=None, init_mode=EnkfInitModeEnum.INIT_CONDITIONAL | ||
| self, | ||
| fs: EnkfFs, | ||
| param_list: StringList = None, |
There was a problem hiding this comment.
Suggested change
| param_list: StringList = None, | |
| param_list: Optional[StringList] = None, |
res/enkf/analysis_config.py
Outdated
| def __init__( | ||
| self, | ||
| user_config_file=None, | ||
| config_content: ConfigContent = None, |
There was a problem hiding this comment.
Suggested change
| config_content: ConfigContent = None, | |
| config_content: Optional[ConfigContent] = None, |
eivindjahren
force-pushed
the
fix_res_imports
branch
from
331dd9b
to
df891d1
Compare
pinkwah
approved these changes
Dec 7, 2021
eivindjahren
force-pushed
the
fix_res_imports
branch
from
df891d1
to
2f87284
Compare
* Adds __all__ to __init__ * Use typing to enforce use of silent dependencies * Remove base dependencies that are unused Several files would rely on importing from the __init__.py of its module. This is quite fragile as the order of imports in the __init__.py must facilitate a partial instantiation in order to avoid circular imports. As more imports are added to resolve the above issue, its no longer possible to continue with that scheme. Therefore imports such as from . import EnkFMain is changed to from .enkf_main import EnkFMain for any file in res/enkf while files outside res/enkf can use from res.enkf import EnkFMain.
eivindjahren
force-pushed
the
fix_res_imports
branch
from
2f87284
to
bea3bb7
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue
#2503
Approach
__all__to__init__Several files would rely on importing from the
__init__.pyof its module. This is quite fragile as the order of imports in the__init__.pymust facilitate a partial instantiation in order to avoid circular imports. As more imports are added to resolve the above issue, it becomes very difficult to continue with that scheme. Therefore imports such asfrom . import EnkFMainis changed tofrom .enkf_main import EnkFMainfor any file insideres/enkfwhile files outsideres/enkfcan usefrom res.enkf import EnkFMain.