Update to [email protected]

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.4.8"
+    rev: "v0.5.5"
     hooks:
      - id: ruff
        args: [ --fix ]

pyproject.toml

@@ -50,7 +50,7 @@ joblib = "*"
 ### Optional dependencies ###
 # development core
 bump-my-version = { version = "*", optional = true }
-ruff = { version = "0.4.8", optional = true }
+ruff = { version = "0.5.5", optional = true }
 coverage = { version = "*", optional = true }
 dill = { version = "*", optional = true }
 ipython = { version = "*", optional = true }

tests/test_data/test_sim_data.py

@@ -290,7 +290,7 @@ def test_to_hdf5(tmp_path):
     sim_data.to_file(fname=FNAME)
     # Make sure data is loaded as Tidy3dDataArray and not xarray DataArray
     for data, data2 in zip(sim_data.data, sim_data2.data):
-        assert type(data) == type(data2)
+        assert type(data) is type(data2)
     assert sim_data == sim_data2
 
 

tidy3d/components/data/dataset.py

@@ -2898,7 +2898,7 @@ def _check_same_coordinates(
     # we can have xarray.DataArray's of different types but still same coordinates
     # we will deal with that case separately
     both_xarrays = isinstance(a, xr.DataArray) and isinstance(b, xr.DataArray)
-    if (not both_xarrays) and type(a) != type(b):
+    if (not both_xarrays) and type(a) is type(b):
         return False
 
     if isinstance(a, UnstructuredGridDataset):

tidy3d/components/field_projection.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Dict, List, Tuple, Union
+from typing import List, Tuple, Union
 
 import numpy as np
 import pydantic.v1 as pydantic
@@ -91,13 +91,6 @@ class FieldProjector(Tidy3dBaseModel):
         units=MICROMETER,
     )
 
-    currents: Dict[str, xr.Dataset] = pydantic.Field(
-        None,
-        title="Surface current densities",
-        description="Dictionary mapping monitor name to an ``xarray.Dataset`` storing the "
-        "surface current densities.",
-    )
-
     @cached_property
     def is_2d_simulation(self) -> bool:
         non_zero_dims = sum(1 for size in self.sim_data.simulation.size if size != 0)
@@ -362,7 +355,7 @@ def integrate_1d(
         pts_u: np.ndarray,
     ):
         """Trapezoidal integration in two dimensions."""
-        return np.trapz(np.squeeze(function) * np.squeeze(phase), pts_u, axis=0)
+        return np.trapz(np.squeeze(function) * np.squeeze(phase), pts_u, axis=0)  # noqa: NPY201
 
     def integrate_2d(
         self,
@@ -372,7 +365,7 @@ def integrate_2d(
         pts_v: np.ndarray,
     ):
         """Trapezoidal integration in two dimensions."""
-        return np.trapz(np.trapz(np.squeeze(function) * phase, pts_u, axis=0), pts_v, axis=0)
+        return np.trapz(np.trapz(np.squeeze(function) * phase, pts_u, axis=0), pts_v, axis=0)  # noqa: NPY201
 
     def _far_fields_for_surface(
         self,