adding tljh_extra_user_conda_channels hook to the hooks and installer

This commit is contained in:
Will Dampier
2022-09-02 14:46:55 -04:00
parent fc8f70463c
commit 8d1033393c
2 changed files with 12 additions and 1 deletions

View File

@@ -15,6 +15,14 @@ def tljh_extra_user_conda_packages():
pass pass
@hookspec
def tljh_extra_user_conda_channels():
"""
Return a list of conda channels to be used during user environment installation.
"""
pass
@hookspec @hookspec
def tljh_extra_user_pip_packages(): def tljh_extra_user_pip_packages():
""" """

View File

@@ -370,13 +370,16 @@ def run_plugin_actions(plugin_manager):
# Install conda packages # Install conda packages
conda_packages = list(set(itertools.chain(*hook.tljh_extra_user_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: if conda_packages:
logger.info( logger.info(
"Installing {} user conda packages collected from plugins: {}".format( "Installing {} user conda packages collected from plugins: {}".format(
len(conda_packages), " ".join(conda_packages) 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 # Install pip packages
user_pip_packages = list(set(itertools.chain(*hook.tljh_extra_user_pip_packages()))) user_pip_packages = list(set(itertools.chain(*hook.tljh_extra_user_pip_packages())))