Skip to content

Commit

Permalink
Merge branch 'dev' into fix-behroozi
Browse files Browse the repository at this point in the history
  • Loading branch information
steven-murray authored Jun 26, 2024
2 parents 64d2485 + 57164c5 commit 1aaf778
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/test_suite.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,11 @@ jobs:
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Setup GNU Fortran
uses: modflowpy/[email protected]
- uses: fortran-lang/setup-fortran@v1
id: setup-fortran
with:
compiler: gcc
version: 13
- name: Install
run: pip install .[dev]
- name: Run Tests
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ repos:
- flake8-print
# Using this mirror lets us use mypyc-compiled black, which is about 2x faster
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 24.3.0
rev: 24.4.2
hooks:
- id: black
- repo: https://github.com/pre-commit/pygrep-hooks
Expand All @@ -46,7 +46,7 @@ repos:
- id: isort

- repo: https://github.com/asottile/pyupgrade
rev: v3.15.2
rev: v3.16.0
hooks:
- id: pyupgrade
args: [--py38-plus]
2 changes: 1 addition & 1 deletion src/hmf/cosmology/growth_factor.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def _d_plus(self, z: Union[float, np.ndarray]) -> Union[float, np.ndarray]:
raise ValueError("Redshifts <0 not supported")
if np.any(a < a_min):
raise ValueError(
f"Cannot compute integral for z > {1/a_min - 1}. Set amin lower."
f"Cannot compute integral for z > {1 / a_min - 1}. Set amin lower."
)

return (self.integral(a) - self.integral(a_min)) * self.cosmo.efunc(z)
Expand Down

0 comments on commit 1aaf778

Please sign in to comment.