zhangyiss/the-littlest-jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/the-littlest-jupyterhub.git synced 2025-12-18 21:54:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

force upgrade of conda itself

Browse Source 
if conda upgrade conda is broken, we are in trouble

this is required to avoid the RemoveError
This commit is contained in:
Min RK
2023-06-09 14:08:03 +02:00
parent 4f0179a84c
commit 4cc55df2a4
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tljh/conda.py
View File

@@ -98,7 +98,7 @@ def install_miniconda(installer_path, prefix):
fix_permissions(prefix) fix_permissions(prefix)
def ensure_conda_packages(prefix, packages): def ensure_conda_packages(prefix, packages, force=False):
""" """
Ensure packages (from conda-forge) are installed in the conda prefix. Ensure packages (from conda-forge) are installed in the conda prefix.
@@ -110,13 +110,16 @@ def ensure_conda_packages(prefix, packages):
# fallback on conda if mamba is not present (e.g. for mamba to install itself) # fallback on conda if mamba is not present (e.g. for mamba to install itself)
conda_executable = os.path.join(prefix, "bin", "conda") conda_executable = os.path.join(prefix, "bin", "conda")
cmd = [conda_executable, "install", "--yes"]
if force:
cmd += ["--force"]
abspath = os.path.abspath(prefix) abspath = os.path.abspath(prefix)
utils.run_subprocess( utils.run_subprocess(
[ cmd
conda_executable, + [
"install",
"-y",
"-c", "-c",
"conda-forge", # Make customizable if we ever need to "conda-forge", # Make customizable if we ever need to
"--prefix", "--prefix",

2
tljh/installer.py
View File

@@ -249,6 +249,8 @@ def ensure_user_environment(user_requirements_txt_file):
# we _could_ explicitly pin Python here, # we _could_ explicitly pin Python here,
# but conda already does this by default # but conda already does this by default
cf_pkgs_to_upgrade, cf_pkgs_to_upgrade,
# use force to avoid RemoveError: 'requests' is a dependency of conda
force=True,
) )
pypi_pkgs_to_upgrade = list(set(to_upgrade) & {"pip"}) pypi_pkgs_to_upgrade = list(set(to_upgrade) & {"pip"})
if pypi_pkgs_to_upgrade: if pypi_pkgs_to_upgrade: