Skip to content

Commit

Permalink
Merge pull request #24 from simonsobs/local_install
Browse files Browse the repository at this point in the history
Split upstream and local installs.
  • Loading branch information
tskisner authored Mar 4, 2024
2 parents 0b30e38 + 389aa26 commit ffb5d89
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
7 changes: 3 additions & 4 deletions pkgs/libactpol/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,11 @@ requirements:
- _openmp_mutex * *_llvm
- libopenblas * openmp_*
- openblas * openmp_*
- cfitsio
# This constraint is to force compatibility with the healpy package.
# remove once healpy is building with cfitsio-4.4.x.
- cfitsio <4.4.0
- wcslib
- libactpol_deps
# This constraint is to enforce compatibility with older cfitsio
# Remove this once healpy package is using latest wcslib / cfitsio.
- healpy
# Remove until this perl bug is fixed
# https://github.com/conda-forge/perl-feedstock/issues/56
- libxcrypt1 # [linux]
Expand Down
13 changes: 11 additions & 2 deletions soconda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -256,17 +256,26 @@ rm -rf "${conda_tmp}" &> /dev/null
find "/tmp" -maxdepth 1 -type f -name 'pixell-*' -exec rm {} \;


# Install local and upstream conda packages all at once.
# Install upstream conda packages.
echo -e "\n\n"
echo "Installing conda packages..." | tee "log_conda"
conda_exec install --yes ${local_pkgs} \
conda_exec install --yes \
--file "${scriptdir}/config/common.txt" \
--file "${confdir}/packages_conda.txt" \
2>&1 | tee -a "log_conda"

conda_exec deactivate
conda_exec activate "${fullenv}"

# Install local conda packages.
echo -e "\n\n"
echo "Installing local packages..." | tee -a "log_conda"
conda_exec install --yes --use-local ${local_pkgs} \
2>&1 | tee -a "log_conda"

conda_exec deactivate
conda_exec activate "${fullenv}"


# Install mpi4py
echo -e "\n\n"
Expand Down

0 comments on commit ffb5d89

Please sign in to comment.