Merge branch 'master' into ku/test

Author: unalmis

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 24.10.0
+    rev: 26.3.1
     hooks:
       - id: black-jupyter
         log_file: devtools/pre-commit.log

desc/basis.py

@@ -2012,8 +2012,8 @@ def _jacobi_body_fun(kk, d_p_a_b_x):
 
 @_jacobi.defjvp
 def _jacobi_jvp(dx, x, xdot):
-    (n, alpha, beta, x) = x
-    (*_, xdot) = xdot
+    n, alpha, beta, x = x
+    *_, xdot = xdot
     f = _jacobi(n, alpha, beta, x, dx)
     df = _jacobi(n, alpha, beta, x, dx + 1)
     # in theory n, alpha, beta, dx aren't differentiable (they're integers)

desc/examples/regenerate_all_equilibria.py

@@ -5,6 +5,7 @@
 python3 regenerate_all_equilibria.py
 
 """
+
 import argparse
 import glob
 import os

desc/optimize/_constraint_wrappers.py

@@ -639,7 +639,7 @@ def _set_eq_state_vector(self):
         for arg in ["R_lmn", "Z_lmn", "L_lmn", "Ra_n", "Za_n"]:
             self._args.remove(arg)
 
-        (self._eq_Z, self._eq_D, self._eq_unfixed_idx) = (
+        self._eq_Z, self._eq_D, self._eq_unfixed_idx = (
             self._eq_solve_objective._Z,
             self._eq_solve_objective._D,
             self._eq_solve_objective._unfixed_idx,

desc/optimize/optimizer.py

@@ -586,17 +586,13 @@ def _maybe_wrap_nonlinear_constraints(
             )
         return objective, nonlinear_constraints
     if wrapper is None and not optimizers[method]["equality_constraints"]:
-        warnings.warn(
-            FutureWarning(
-                f"""
+        warnings.warn(FutureWarning(f"""
                 Nonlinear constraints detected but method {method} does not support
                 nonlinear constraints. Defaulting to method "proximal-{method}"
                 In the future this will raise an error. To ignore this warning, specify
                 a wrapper "proximal-" to convert the nonlinearly constrained problem
                 into an unconstrained one.
-                """
-            )
-        )
+                """))
         wrapper = "proximal"
     if wrapper is not None and wrapper.lower() in ["prox", "proximal"]:
         perturb_options = options.pop("perturb_options", {})

desc/vmec.py

@@ -790,7 +790,7 @@ def save(  # noqa: C901
         idx = np.where(eq.R_basis.modes[:, 1] == 0)[0]
         R0_n = np.zeros((2 * N + 1,))
         for k in idx:
-            (l, m, n) = eq.R_basis.modes[k, :]
+            l, m, n = eq.R_basis.modes[k, :]
             R0_n[n + N] += (-2 * (l // 2 % 2) + 1) * eq.R_lmn[k]
         raxis_cc = file.createVariable("raxis_cc", np.float64, ("n_tor",))
         raxis_cc.long_name = "cos(n*p) component of magnetic axis R coordinate"
@@ -807,7 +807,7 @@ def save(  # noqa: C901
         idx = np.where(eq.Z_basis.modes[:, 1] == 0)[0]
         Z0_n = np.zeros((2 * N + 1,))
         for k in idx:
-            (l, m, n) = eq.Z_basis.modes[k, :]
+            l, m, n = eq.Z_basis.modes[k, :]
             Z0_n[n + N] += (-2 * (l // 2 % 2) + 1) * eq.Z_lmn[k]
         zaxis_cs = file.createVariable("zaxis_cs", np.float64, ("n_tor",))
         zaxis_cs.long_name = "sin(n*p) component of magnetic axis Z coordinate"
@@ -1600,13 +1600,13 @@ def write_vmec_input(cls, eq, fname, header=None, **kwargs):  # noqa: C901
         idx = np.where(eq.R_basis.modes[:, 1] == 0)[0]
         R0_n = np.zeros((2 * eq.N + 1,))
         for k in idx:
-            (l, m, n) = eq.R_basis.modes[k, :]
+            l, m, n = eq.R_basis.modes[k, :]
             R0_n[n + eq.N] += (-2 * (l // 2 % 2) + 1) * eq.R_lmn[k]
         # Z axis
         idx = np.where(eq.Z_basis.modes[:, 1] == 0)[0]
         Z0_n = np.zeros((2 * eq.N + 1,))
         for k in idx:
-            (l, m, n) = eq.Z_basis.modes[k, :]
+            l, m, n = eq.Z_basis.modes[k, :]
             Z0_n[n + eq.N] += (-2 * (l // 2 % 2) + 1) * eq.Z_lmn[k]
         # R axis cosine coefficients
         f.write("  RAXIS_CC = ")

devtools/dev-requirements.txt

@@ -19,7 +19,7 @@ sphinx-design
 
 
 # linting
-black[jupyter] == 24.10.0
+black[jupyter] == 26.3.1
 flake8 ~= 7.3
 flake8-docstrings >= 1.0.0, <= 1.7.0
 flake8-eradicate >= 1.0.0, <= 1.5.0

tests/test_examples.py

@@ -1605,7 +1605,7 @@ def test_regcoil_windowpane_check_B(regcoil_windowpane_coils):
 @pytest.mark.slow
 def test_regcoil_PF_check_B(regcoil_PF_coils):
     """Test precise QA PF (helicity=(0,2)) regcoil solution."""
-    (data, surface_current_field, eq) = regcoil_PF_coils
+    data, surface_current_field, eq = regcoil_PF_coils
     assert surface_current_field.G == 0
     assert abs(surface_current_field.I) > 0
     chi_B = data["chi^2_B"][0]
@@ -1629,7 +1629,7 @@ def test_regcoil_helical_coils_check_objective_method(
     regcoil_helical_coils_scan,
 ):
     """Test precise QA helical coil regcoil solution."""
-    (data, initial_surface_current_field, eq) = regcoil_helical_coils_scan
+    data, initial_surface_current_field, eq = regcoil_helical_coils_scan
     lam_index = 1
     lam = data["lambda_regularization"][lam_index]
     initial_surface_current_field.Phi_mn = data["Phi_mn"][lam_index]

tests/test_surfaces.py

@@ -151,7 +151,7 @@ def test_constant_offset_surface_circle(self):
         s = FourierRZToroidalSurface()
         grid = LinearGrid(M=3, N=2)
         offset = 1
-        (s_offset, data, _) = s.constant_offset_surface(
+        s_offset, data, _ = s.constant_offset_surface(
             offset, grid, M=1, N=1, full_output=True
         )
         r_offset_surf = data["x_offset_surface"]
@@ -260,7 +260,7 @@ def test_constant_offset_surface_rot_ellipse(self):
         s = eq.surface
         s.change_resolution(M=2, N=2)
         offset = 0.1
-        (s_offset, data, _) = s.constant_offset_surface(
+        s_offset, data, _ = s.constant_offset_surface(
             offset, grid=None, M=2, N=2, full_output=True
         )
         r_offset_surf = data["x_offset_surface"]