Skip to content

Commit

Permalink
Fix GHA (#626)
Browse files Browse the repository at this point in the history
* Move up "Install CCL"

* Install CCL prereqs earlier

* Reinstall libarchive

* Install all prereqs from conda together

* Update version to 1.12.3

---------

Co-authored-by: m-aguena <[email protected]>
  • Loading branch information
hsinfan1996 and m-aguena authored Jul 16, 2024
1 parent d1bf0a1 commit 9f0dbbc
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
14 changes: 8 additions & 6 deletions .github/workflows/build_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,29 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: conda-incubator/setup-miniconda@v3
- name: Install prereq using conda
- name: Install prereq and NumCosmo using conda
run: |
echo "$CONDA/bin" >> $GITHUB_PATH
conda install -c conda-forge gobject-introspection pygobject sphinx sphinx_rtd_theme nbconvert pandoc ipython
conda install -c conda-forge gobject-introspection pygobject numcosmo cmake swig setuptools_scm sphinx sphinx_rtd_theme nbconvert pandoc ipython
- name: Install prereq using pip
run: |
pip install -r requirements.txt
- name: Install the package
run: |
pip install .
- name: Install NumCosmo from conda-forge
run: |
conda install -c conda-forge numcosmo
# temporarily moved up due to libarchive issue - see PR 620
# - name: Install NumCosmo from conda-forge
# run: |
# conda install -c conda-forge numcosmo
- name: Install cluster_toolkit from source
run: |
git clone https://github.com/tmcclintock/cluster_toolkit.git
cd cluster_toolkit
pip install .
- name: Install CCL from source
run: |
conda install -c conda-forge cmake swig setuptools_scm
# temporarily moved up due to libarchive issue - see PR 620
#conda install -c conda-forge cmake swig setuptools_scm
git clone https://github.com/LSSTDESC/CCL
cd CCL
pip install --no-use-pep517 .
Expand Down
2 changes: 1 addition & 1 deletion clmm/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@
)
from . import support

__version__ = "1.12.2"
__version__ = "1.12.3"

0 comments on commit 9f0dbbc

Please sign in to comment.