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

Add a flag to prevent the compass package from being reinstalled with the load script #396

Merged
merged 2 commits into from
May 29, 2022
Merged

Add a flag to prevent the compass package from being reinstalled with the load script #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5afa5aa
Check for $NO_COMPASS_REINSTALL before compass reinstall
xylar May 23, 2022
c9530c9
In matrix build/setup, don't reinstall compass
xylar May 23, 2022
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
3 changes: 2 additions & 1 deletion conda/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,8 @@ def write_load_compass(template_path, activ_path, conda_base, env_type,
if env_type == 'dev':
update_compass = \
"""
if [[ -f "./setup.py" && -d "compass" ]]; then
if [[ -z "${NO_COMPASS_REINSTALL}" && -f "./setup.py" && \\
-d "compass" ]]; then
# safe to assume we're in the compass repo
# update the compass installation to point here
mkdir -p conda/logs
Expand Down
3 changes: 2 additions & 1 deletion utils/matrix/setup_matrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,8 @@ def compass_setup(script_name, setup_command, mpas_path, mpas_model, work_base,

work_dir = '{}/{}'.format(work_base, suffix)

args = 'source {}; ' \
args = 'export NO_COMPASS_REINSTALL=true;' \
'source {}; ' \
'{} ' \
'-p {} ' \
'-w {} ' \
Expand Down