From 8d1033393c134a618a105b0589c7b641dab863ba Mon Sep 17 00:00:00 2001 From: Will Dampier Date: Fri, 2 Sep 2022 14:46:55 -0400 Subject: [PATCH] adding tljh_extra_user_conda_channels hook to the hooks and installer --- tljh/hooks.py | 8 ++++++++ tljh/installer.py | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/tljh/hooks.py b/tljh/hooks.py index ddb1f3f..0a94a62 100644 --- a/tljh/hooks.py +++ b/tljh/hooks.py @@ -15,6 +15,14 @@ def tljh_extra_user_conda_packages(): pass +@hookspec +def tljh_extra_user_conda_channels(): + """ + Return a list of conda channels to be used during user environment installation. + """ + pass + + @hookspec def tljh_extra_user_pip_packages(): """ diff --git a/tljh/installer.py b/tljh/installer.py index 8da932c..baef3ef 100644 --- a/tljh/installer.py +++ b/tljh/installer.py @@ -370,13 +370,16 @@ def run_plugin_actions(plugin_manager): # Install conda packages conda_packages = list(set(itertools.chain(*hook.tljh_extra_user_conda_packages()))) + conda_channels = list(itertools.chain(*hook.tljh_extra_user_conda_channels())) + if len(conda_channels) == 0: + conda_channels = ('conda-forge',) if conda_packages: logger.info( "Installing {} user conda packages collected from plugins: {}".format( len(conda_packages), " ".join(conda_packages) ) ) - conda.ensure_conda_packages(USER_ENV_PREFIX, conda_packages) + conda.ensure_conda_packages(USER_ENV_PREFIX, conda_packages, conda_channels=conda_channels) # Install pip packages user_pip_packages = list(set(itertools.chain(*hook.tljh_extra_user_pip_packages())))