Merge branch 'main' into jp-3689

spacetelescope · Sep 10, 2024 · 3b0f596 · 3b0f596
2 parents ac0ae67 + eb35e2a
commit 3b0f596
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,20 @@
+1.8.1 (2024-09-08)
+==================
+
+Bug Fixes
+---------
+
+- Fixed memory leak in C-extension. (`#281
+  <https://github.com/spacetelescope/stcal/issues/281>`_)
+
+
+General
+-------
+
+- use ``towncrier`` to handle changelog entries (`#284
+  <https://github.com/spacetelescope/stcal/issues/284>`_)
+
+
 1.8.0 (2024-08-14)
 ==================
 

diff --git a/changes/281.bugfix.rst b/changes/281.bugfix.rst
diff --git a/changes/282.bugfix.rst b/changes/282.bugfix.rst
@@ -0,0 +1 @@
+Implement byteorder swap method that is forward-compatible with numpy 2.0 in jwst ramp_fitting.
diff --git a/changes/284.general.rst b/changes/284.general.rst
diff --git a/src/stcal/ramp_fitting/ols_fit.py b/src/stcal/ramp_fitting/ols_fit.py
@@ -687,9 +687,9 @@ def ols_ramp_fit_single(ramp_data, buffsize, save_opt, readnoise_2d, gain_2d, we
         # ramp fitting.
         rn_bswap, gain_bswap = bswap
         if rn_bswap:
-            readnoise_2d.newbyteorder('S').byteswap(inplace=True)
+            readnoise_2d.view(readnoise_2d.dtype.newbyteorder('S')).byteswap(inplace=True)
         if gain_bswap:
-            gain_2d.newbyteorder('S').byteswap(inplace=True)
+            gain_2d.view(gain_2d.dtype.newbyteorder('S')).byteswap(inplace=True)
 
         c_diff = c_end - c_start
         log.info(f"Ramp Fitting C Time: {c_diff}")
@@ -731,7 +731,7 @@ def handle_array_endianness(arr, sys_order):
     arr_order = arr.dtype.byteorder
     bswap = False
     if (arr_order == ">" and sys_order == "<") or (arr_order == "<" and sys_order == ">"):
-        arr.newbyteorder('S').byteswap(inplace=True)
+        arr.view(arr.dtype.newbyteorder('S')).byteswap(inplace=True)
         bswap = True
 
     return arr, bswap