Add astropy import guard (tardis-sn#2470)

* Add astropy import guard * mailmap
AyushiDaksh · Nov 15, 2023 · 84cf2e6 · 84cf2e6
1 parent 87e8f3a
commit 84cf2e6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.mailmap b/.mailmap
@@ -5,6 +5,7 @@ Alexander Holas <[email protected]>
 Alexander Holas <[email protected]>
 Alexander Holas <[email protected]> AlexHls <[email protected]>
 Alexander Holas <[email protected]> AlexHls <[email protected]>
+Alexander Holas <[email protected]>
 
 Alice Harpole <[email protected]>
 Alice Harpole <[email protected]> Alice Harpole <[email protected]>

diff --git a/tardis/__init__.py b/tardis/__init__.py
@@ -12,13 +12,20 @@
 # ----------------------------------------------------------------------------
 
 import sys
+import warnings
 
 # ----------------------------------------------------------------------------
 
-from astropy import physical_constants, astronomical_constants
+if ("astropy.units" in sys.modules) or ("astropy.constants" in sys.modules):
+    warnings.warn(
+        "Astropy is already imported externally. Astropy should be imported"
+        " after TARDIS."
+    )
+else:
+    from astropy import physical_constants, astronomical_constants
 
-physical_constants.set("codata2014")
-astronomical_constants.set("iau2012")
+    physical_constants.set("codata2014")
+    astronomical_constants.set("iau2012")
 
 # ----------------------------------------------------------------------------