diff --git a/discO/conftest.py b/discO/conftest.py index 76fdbc3e..eb007015 100644 --- a/discO/conftest.py +++ b/discO/conftest.py @@ -12,6 +12,8 @@ # IMPORTS # STDLIB +import configparser +import importlib import os # THIRD PARTY @@ -55,9 +57,28 @@ 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" + # THIRD PARTY + import galpy + + importlib.reload(galpy) + + if ".tmp" in os.getcwd(): + + # THIRD PARTY + from galpy.util import config as galpy_config + + # configuration + galpy_config._APY_LOADED = True + galpy_config.__config__.set("astropy", "astropy-units", "True") + galpy_config.__config__.set("astropy", "astropy-coords", "True") + + # write config and read it + cfilename = os.path.join(os.path.expanduser("~"), ".galpyrc") + galpy_config.write_config(cfilename, galpy_config.__config__) + + __config__ = configparser.ConfigParser() + __config__.read(cfilename) + galpy_config.__config__ = __config__ # ------------------------------------------------------ diff --git a/discO/setup_package.py b/discO/setup_package.py index 9bf74230..873d2a30 100644 --- a/discO/setup_package.py +++ b/discO/setup_package.py @@ -8,6 +8,9 @@ from __future__ import absolute_import +# STDLIB +import importlib + __all__ = ["HAS_AGAMA", "HAS_GALA", "HAS_GALPY", "HAS_TQDM"] @@ -48,12 +51,16 @@ else: HAS_GALPY = True - # TODO better way of ensuring unit! + importlib.reload(galpy) + # THIRD PARTY - from galpy.util.config import __config__ + from galpy.util import config as galpy_config - __config__.set("astropy", "astropy-units", "True") - __config__.set("astropy", "astropy-coords", "True") + # configuration + galpy_config._APY_LOADED = True + galpy_config.__config__.set("astropy", "astropy-units", "True") + galpy_config.__config__.set("astropy", "astropy-coords", "True") + galpy_config.default_configuration["astropy"]["astropy-units"] = True # /try diff --git a/setup.cfg b/setup.cfg index 25fbeed8..78c9b9c0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -17,6 +17,7 @@ packages = find: python_requires = >=3.8 setup_requires = setuptools_scm install_requires = + extension_helpers astropy >= 4.3 numpy >= 1.17 PyYAML