Merge pull request #379 from LSSTDESC/combine-env-file

Combine the two environment yml files

bin/install.sh

@@ -2,6 +2,7 @@
 
 # Stop on error
 set -e
+set -x
 
 if [ -d "./conda" ]
 then
@@ -37,12 +38,8 @@ chmod +x Mambaforge3.sh
 ./Mambaforge3.sh -b -p ./conda
 source ./conda/bin/activate
 
-# It seems to be a bug on conda that if our required pip-installable
-# packages depend on the conda-forge packages they don't detect them
-# properly if they are all in the same environment file. So we need to
-# split them up
-mamba env update --file environment-nopip.yml
-mamba env update --file environment-piponly.yml 
+# Install everything
+mamba env update --file environment.yml
 
 # We do this to get around a bug in the healpy installation
 # where it installs its own copy of libomp instead of using

environment-piponly.yml → environment.yml

@@ -1,4 +1,38 @@
+channels:
+  - conda-forge
 dependencies:
+  - astropy=6.1.*
+  - camb=1.5.*
+  - cosmosis=3.7.*
+  - cmake
+  - dask=2024.5.2
+  - dm-tree=0.1.8
+  - fitsio=1.2.*
+  - firecrown=1.7.*
+  - h5py>=3=mpi_mpich_*
+  - healpy=1.16.*
+  - healsparse=1.10.*
+  - jax=0.4.27
+  - jaxlib=0.4.23
+  - jupyter=1.0.*
+  - matplotlib=3.8.*
+  - mpi4py>=3
+  - mpich>=4.*
+  - namaster=2.0.*
+  - numpy=1.26.*
+  - pandas>=2.0
+  - psutil=5.9.*
+  - pyccl=3.0.*
+  - python=3.10.*
+  - scikit-learn=1.5.*
+  - scipy=1.13.*
+  - tables-io-full=0.9.*
+  - threadpoolctl=3.5.*
+  - tjpcov=0.4.*
+  - treecorr=5.0.*
+  - pip=24.0.*
+  - pygraphviz=1.13.*
+  - mockmpi
   - pip:
     - ceci==2.0.1
     - git+https://github.com/jlvdb/hyperbolic@b88b107a291fa16c2006cf971ce610248d58e94c