Skip to content

Commit d97da5c

Browse files
authored
Merge branch 'main' into jax_version
2 parents 900013a + 04d22c6 commit d97da5c

2 files changed

Lines changed: 4 additions & 16 deletions

File tree

jax_galsim/fitswcs.py

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -835,27 +835,15 @@ def __eq__(self, other):
835835
and self.center == other.center
836836
and (
837837
(self.pv is None and other.pv is None)
838-
or (
839-
self.pv is not None
840-
and other.pv is not None
841-
and jnp.array_equal(self.pv, other.pv)
842-
)
838+
or jnp.array_equal(self.pv, other.pv)
843839
)
844840
and (
845841
(self.ab is None and other.ab is None)
846-
or (
847-
self.ab is not None
848-
and other.ab is not None
849-
and jnp.array_equal(self.ab, other.ab)
850-
)
842+
or jnp.array_equal(self.ab, other.ab)
851843
)
852844
and (
853845
(self.abp is None and other.abp is None)
854-
or (
855-
self.abp is not None
856-
and other.abp is not None
857-
and jnp.array_equal(self.abp, other.abp)
858-
)
846+
or jnp.array_equal(self.abp, other.abp)
859847
)
860848
)
861849

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ readme = "README.md"
1616
dependencies = [
1717
"numpy >=1.18.0",
1818
"galsim >=2.3.0",
19-
"jax >=0.5.0",
19+
"jax >=0.8.0",
2020
"astropy >=2.0",
2121
"quadax",
2222
]

0 commit comments

Comments
 (0)