Make all environment elements work same way

usnistgov · Feb 22, 2024 · b3c0f4a · b3c0f4a
1 parent ce22702
commit b3c0f4a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/fipy/__init__.py b/fipy/__init__.py
@@ -76,17 +76,17 @@ def _excepthook(*args):
 
 if _log.isEnabledFor(logging.DEBUG):
     try:
-        _fipy_environment["conda"] = environment.conda_info()
+        _fipy_environment.update(environment.conda_info())
     except:
         pass
 
     try:
-        _fipy_environment["pip"] = environment.pip_info()
+        _fipy_environment.update(environment.pip_info())
     except:
         pass
 
     try:
-        _fipy_environment["nix"] = environment.nix_info()
+        _fipy_environment.update(environment.nix_info())
     except:
         pass
 

diff --git a/fipy/tools/logging/environment.py b/fipy/tools/logging/environment.py
@@ -25,6 +25,7 @@ def conda_info(conda="conda"):
     stdout = stdout.decode('ascii')
 
     info["conda_info"] = json.loads(stdout)
+
     p = subprocess.Popen([conda, "env", "export",
                           "--name", info["conda_info"]["active_prefix_name"],
                           "--json"],
@@ -53,7 +54,9 @@ def pip_info(python="python"):
     stdout, _ = p.communicate()
     stdout = stdout.decode('ascii')
 
-    return json.loads(stdout)
+    info["pip"] = json.loads(stdout)
+
+    return info
 
 def nix_info():
     """Collect information about nix environment.
@@ -83,7 +86,8 @@ def nix_info():
     stdout, _ = p.communicate()
     stdout = stdout.decode('ascii')
 
-    info["nix_info"] = json.loads(stdout)
+    info["nix"] = json.loads(stdout)
+
     return info
 
 def package_info():