Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Re-install conda/mamba for every tljh upgrade (doesn't imply upgrade) #968

Merged
merged 3 commits into from
Mar 18, 2024
Merged

Re-install conda/mamba for every tljh upgrade (doesn't imply upgrade) #968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fe9912
tests: test pip install plugin with no-dependency package
consideRatio Feb 25, 2024
7d8a848
tests: show mamba list for the user environment before/after upgrade
consideRatio Feb 25, 2024
4e397bc
Re-install conda/mamba for every tljh upgrade (doesn't imply upgrade)
consideRatio Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/integration-test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,15 +167,23 @@ def run_test(
command = f"python3 /srv/src/bootstrap/bootstrap.py --version={upgrade_from}"
run_command(container_name, command)

# show user environment
command = "/opt/tljh/user/bin/mamba list"
run_command(container_name, command)

command = f"python3 /srv/src/bootstrap/bootstrap.py {' '.join(installer_args)}"
run_command(container_name, command)

# show user environment (again if upgrade)
command = "/opt/tljh/user/bin/mamba list"
run_command(container_name, command)

# Install pkgs from requirements in hub's pip, where
# the bootstrap script installed the others
command = "/opt/tljh/hub/bin/python3 -m pip install -r /srv/src/integration-tests/requirements.txt"
run_command(container_name, command)

# show environment
# show hub environment
command = "/opt/tljh/hub/bin/python3 -m pip freeze"
run_command(container_name, command)

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/plugins/simplest/tljh_simplest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def tljh_extra_user_conda_packages():

@hookimpl
def tljh_extra_user_pip_packages():
return ["django"]
return ["simplejson"]


@hookimpl
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/test_simplest_plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def test_tljh_extra_user_conda_packages():


def test_tljh_extra_user_pip_packages():
subprocess.check_call([f"{USER_ENV_PREFIX}/bin/python3", "-c", "import django"])
subprocess.check_call([f"{USER_ENV_PREFIX}/bin/python3", "-c", "import simplejson"])


def test_tljh_extra_hub_pip_packages():
Expand Down
9 changes: 4 additions & 5 deletions tljh/installer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,11 +242,10 @@ def ensure_user_environment(user_requirements_txt_file):
)
to_upgrade.append(pkg)

# force reinstall conda/mamba to ensure a basically consistent env
# avoids issues with RemoveError: 'requests' is a dependency of conda
# only do this for 'old' conda versions known to have a problem
# we don't know how old, but we know 4.10 is affected and 23.1 is not
if not is_fresh_install and V(package_versions.get("conda", "0")) < V("23.1"):
# force reinstall conda/mamba to ensure conda doesn't raise error
# "RemoveError: 'requests' is a dependency of conda" later on when
# conda/mamba is used to install/upgrade something
if not is_fresh_install:
# force-reinstall doesn't upgrade packages
# it reinstalls them in-place
# only reinstall packages already present
Expand Down
Loading