From cda4f227ef8e1b129995e6db6743e888e7d4990f Mon Sep 17 00:00:00 2001 From: "Nathaniel Starkman (@nstarman)" Date: Sat, 11 Sep 2021 14:50:21 -0400 Subject: [PATCH] move galpyrc Signed-off-by: Nathaniel Starkman (@nstarman) --- discO/plugin/galpy/tests/.galpyrc => .galpyrc | 0 discO/conftest.py | 4 ++++ 2 files changed, 4 insertions(+) rename discO/plugin/galpy/tests/.galpyrc => .galpyrc (100%) diff --git a/discO/plugin/galpy/tests/.galpyrc b/.galpyrc similarity index 100% rename from discO/plugin/galpy/tests/.galpyrc rename to .galpyrc diff --git a/discO/conftest.py b/discO/conftest.py index 063330f1..76fdbc3e 100644 --- a/discO/conftest.py +++ b/discO/conftest.py @@ -54,6 +54,10 @@ SKIP_NO_GALPY = pytest.mark.skipif(not HAS_GALPY, reason="needs galpy") if not HAS_GALPY: collect_ignore.append("plugin/galpy/") +else: + from galpy.util import config as galpy_config + galpy_config.__config__["astropy"]["astropy-units"] = "True" + galpy_config.__config__["astropy"]["astropy-coords"] = "True" # ------------------------------------------------------