Resolving shell environment variables name space conflicts with parm #28
Conversation
…n config files when parcing EXPDIR config files
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## develop #28 +/- ##
===========================================
+ Coverage 48.23% 50.06% +1.82%
===========================================
Files 18 18
Lines 1644 1648 +4
Branches 335 336 +1
===========================================
+ Hits 793 825 +32
+ Misses 791 763 -28
Partials 60 60 ☔ View full report in Codecov by Sentry. |
…hen usese the key set xor as before
@aerorahul Done: Configuration Unit Tests now pass in GitHub Runners with the update to the bash shell in the Subprocess. Also I updated the approach that solves the primary name classing issue with feedback from these tests that is now also more strait forward than before. Please re-review these changes. Thnx. ~T.McG |
src/wxflow/configuration.py
Outdated
| keys_in_scripts = set() | ||
| regex_pattern = 'export\\s+\\b(' + '|'.join(map(re.escape, default_env.keys())) + ')(?==)' | ||
| for script in scripts: | ||
| result = subprocess.run(['grep', '-o', '-P', regex_pattern, script], stdout=subprocess.PIPE) | ||
| keys_in_scripts.update(result.stdout.decode().split()) |
There was a problem hiding this comment.
Can this be explained a bit?
The task is simple here; get a dictionary of key-value pairs set by a shell script.
There was a problem hiding this comment.
The old approach was faulty, this one (not intended to be used) resorted to using a regular expression to fish out any environment variable that is in the user spaces that is also in a config file. It is here only to show what is needed to pass the unit tests. I don't think this is good solution, so I'm thinking of another approach entirely to avoid chicken-before-egg dilemma that this will not solve.
There was a problem hiding this comment.
Yes and then just check if the key is in both!
|
Not required by author. |
Description
This PR updates the instantiation of the Configuration Class of wxflow in order to resolve the namespaces clashes between the environment variables in shell that launches
setup_xml.pyand the values used in config parm variables.With this update the namespaces between the shell environment variables and the variables in parm files used by the Configuration Class are preserved. A Unit Test demonstrating this can be found here.
For example, if the environment variable ACCOUNT is set in the shell that
setup_expt.pyis launched from, it would would fail as that variable is also used in template ofconfig.base. Correspondingly, ifsetup_xml.pywas executed with ACCOUNT set in the shell it would populate the XML file with UNKOWN without erroring. With this update the value in the XML file would be set he value designated in the corresponding instantiated parm fileconfig.base.The Unit Tests specified below shows this failure does not occure and the updates are used in Test PR 2581
Type of change
How Has This Been Tested?
This PR Branch was incorporated into Global-Workflow PR 2581 Unit Tests using GitHub Actions.
Here are the results of running the Unit Tests from GitHub Actions. PR 2581 also does full CI run throughs using this update in the Configuration Class.
Checklist