From ce4ad9d9f49cfda64624dc95da1c590c4c328545 Mon Sep 17 00:00:00 2001 From: Bradley Sappington Date: Thu, 12 Oct 2023 16:45:17 -0400 Subject: [PATCH 1/2] fix complex nr syntax --- poppy/fresnel.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/poppy/fresnel.py b/poppy/fresnel.py index a7a0d31d..118013ea 100644 --- a/poppy/fresnel.py +++ b/poppy/fresnel.py @@ -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() From 1f65b4cf382516807e14a3873dcc4211279aad00 Mon Sep 17 00:00:00 2001 From: Bradley Sappington Date: Fri, 13 Oct 2023 11:17:07 -0400 Subject: [PATCH 2/2] update min astropy version --- pyproject.toml | 2 +- tox.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index cbff99b9..47c6ac6b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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" diff --git a/tox.ini b/tox.ini index e56858f2..974862db 100644 --- a/tox.ini +++ b/tox.ini @@ -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