Remove .DATA suffix from REFCASE path #5245
Merged
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
andreas-el
added
the
release-notes:maintenance
Codecov Report
@@ Coverage Diff @@
## main #5245 +/- ##
==========================================
+ Coverage 73.17% 73.18% +0.01%
==========================================
Files 392 391 -1
Lines 26963 26871 -92
Branches 1965 1965
==========================================
- Hits 19729 19665 -64
+ Misses 6670 6642 -28
Partials 564 564
... and 4 files with indirect coverage changes 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
andreas-el
force-pushed
the
refcase_allow_data_in_path
branch
from
41ddef1
to
5f6ef7b
Compare
DanSava
approved these changes
Apr 18, 2023
| @@ -179,6 +179,9 @@ def _load_refcase(refcase_file: Optional[str]) -> Optional[EclSum]: | |||
| if refcase_file is None: | |||
| return None | |||
|
|
|||
| if refcase_file.endswith(".DATA"): | |||
| refcase_file = refcase_file[:-5] | |||
There was a problem hiding this comment.
I guess this comment applies here as well: #5247 (comment)
This will remove any suffix present in the filepath/name Retain backwards compatibility where REFCASE had `.DATA` suffix The suffix is removed regardless, but this allows us to validate presence of refcase .UNSMRY and .SMSPEC files later.
andreas-el
force-pushed
the
refcase_allow_data_in_path
branch
from
5f6ef7b
to
fe71c01
Compare
oyvindeide
approved these changes
Apr 19, 2023
| @@ -179,6 +179,9 @@ def _load_refcase(refcase_file: Optional[str]) -> Optional[EclSum]: | |||
| if refcase_file is None: | |||
| return None | |||
|
|
|||
| refcase_filepath = Path(refcase_file) | |||
| refcase_file = str(refcase_filepath.parent / refcase_filepath.stem) | |||
|
|
|||
| if not os.path.exists(refcase_file + ".UNSMRY"): | |||
There was a problem hiding this comment.
Outside the scope here, so no need to fix it, but since you are now using pathlib you can do:
if not (refcase_file / ".UNSMRY").exists:
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.
Retain backwards compatibility where REFCASE had
.DATAsuffix The suffix is removed regardless, but this allows us to validate presence of refcase .UNSMRY and .SMSPEC files.Issue
Resolves #5244
Approach
Short description of the approach
Pre review checklist
Adding labels helps the maintainers when writing release notes. This is the list of release note labels.