Skip to content

Commit

Permalink
Merge pull request #226 from altheaden/pip-install-flags
Browse files Browse the repository at this point in the history
Add additional flags to `pip install` command in docs and deployment
  • Loading branch information
xylar authored Sep 24, 2024
2 parents 69665e0 + 9088c0f commit 8a0db95
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 12 deletions.
2 changes: 1 addition & 1 deletion configure_polaris_envs.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def main():
f'[email protected]:{args.mache_fork}.git mache && ' \
f'cd mache && ' \
f'conda install -y --file spec-file.txt && ' \
f'python -m pip install --no-deps .'
f'python -m pip install --no-deps --no-build-isolation .'

check_call(commands, logger=logger)

Expand Down
20 changes: 11 additions & 9 deletions deploy/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,13 @@ def main(): # noqa: C901

if options['local_mache']:
print('Install local mache\n')
commands = f'source {conda_base}/etc/profile.d/conda.sh && ' \
f'conda activate {conda_env_name} && ' \
f'conda install -y importlib_resources jinja2' \
f' lxml pyyaml progressbar2 && ' \
f'cd ../build_mache/mache && ' \
f'python -m pip install --no-deps .'
commands = \
f'source {conda_base}/etc/profile.d/conda.sh && ' \
f'conda activate {conda_env_name} && ' \
f'conda install -y importlib_resources jinja2' \
f' lxml pyyaml progressbar2 && ' \
f'cd ../build_mache/mache && ' \
f'python -m pip install --no-deps --no-build-isolation .'
check_call(commands, logger=options['logger'])

previous_conda_env = conda_env_name
Expand Down Expand Up @@ -618,7 +619,7 @@ def _build_conda_env(options, activate_base):
f'{activate_env} && ' \
f'cd {source_path} && ' \
f'rm -rf polaris.egg-info && ' \
f'python -m pip install --no-deps -e .'
f'python -m pip install --no-deps --no-build-isolation -e .'
check_call(commands, logger=logger)

print('Installing pre-commit\n')
Expand Down Expand Up @@ -682,7 +683,7 @@ def _build_jigsaw(options, activate_env, source_path, conda_env_path):
commands = \
f'{activate_env} && ' \
f'cd {source_path}/jigsaw-python && ' \
f'python -m pip install --no-deps -e . && ' \
f'python -m pip install --no-deps --no-build-isolation -e . && ' \
f'cp jigsawpy/_bin/* ${{CONDA_PREFIX}}/bin'
check_call(commands, logger=logger)

Expand Down Expand Up @@ -1061,7 +1062,8 @@ def _write_load_polaris(options, prefix, spack_script, env_vars):
# update the polaris installation to point here
mkdir -p deploy_tmp/logs
echo Reinstalling polaris package in edit mode...
python -m pip install --no-deps -e . &> deploy_tmp/logs/install_polaris.log
python -m pip install --no-deps --no-build-isolation -e . \\
&> deploy_tmp/logs/install_polaris.log
echo Done.
echo
fi
Expand Down
4 changes: 2 additions & 2 deletions docs/developers_guide/quick_start.md
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ With the conda environment activated, you can switch branches and update
just the `polaris` package with:

```bash
python -m pip install -e .
python -m pip install --no-deps --no-build-isolation -e .
```

The activation script will do this automatically when you source it in
Expand Down Expand Up @@ -444,7 +444,7 @@ With the conda environment activated, you can switch branches and update
just the `polaris` package with:

```bash
python -m pip install -e .
python -m pip install --no-deps --no-build-isolation -e .
```

This will be substantially faster than rerunning
Expand Down

0 comments on commit 8a0db95

Please sign in to comment.