Skip to content

Commit

Permalink
Merge pull request #592 from BradleySappington/ci_fix
Browse files Browse the repository at this point in the history
Fix Various issues with CI actions
  • Loading branch information
BradleySappington authored Oct 13, 2023
2 parents 8e2d84d + 1f65b4c commit eee741a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions poppy/fresnel.py
Original file line number Diff line number Diff line change
Expand Up @@ -721,9 +721,9 @@ def _propagate_ptp(self, dz):
wavelen_m = self.wavelength.to(u.m).value

if accel_math._USE_NUMEXPR:
exp_t = ne.evaluate("exp(-1.0j * pi * wavelen_m * (z_direct) * rhosqr)")
exp_t = ne.evaluate("exp(-1j * pi * wavelen_m * (z_direct) * rhosqr)")
else:
exp_t = xp.exp(-1.0j * np.pi * wavelen_m * z_direct * rhosqr)
exp_t = xp.exp(-1j * np.pi * wavelen_m * z_direct * rhosqr)

self._fft()

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies = [
"numpy>=1.20.0",
"scipy>=1.5.0",
"matplotlib>=3.2.0",
"astropy>=4.3.0",
"astropy>=5.1.0",
]
dynamic = ["version"]
readme = "README.rst"
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ deps=
cov: pytest-cov
syn: synphot
legacy: numpy==1.20.0
legacy: astropy==4.3.0
legacy: astropy==5.1.0
legacy: scipy==1.10.1
latest: -rrequirements.txt
astropydev: git+https://github.com/astropy/astropy
Expand Down

0 comments on commit eee741a

Please sign in to comment.