Ruff tardis/model (tardis-sn#2828)

* ruff model auto safe fixes

* ruff model auto unsafe fixes

* black tardis/model/base.py

tardis/model/__init__.py

@@ -1,8 +1,8 @@
 """
-Holding information about the TARDIS model. 
+Holding information about the TARDIS model.
 
-This includes information about the shell structure, 
-density, abundance, temperatures and dilution 
+This includes information about the shell structure,
+density, abundance, temperatures and dilution
 factor of the model used in the simulation.
 """
 

tardis/model/base.py

@@ -350,22 +350,20 @@ def from_csvy(cls, config, atom_data=None, legacy_mode_enabled=False):
         )
 
         if hasattr(csvy_model_data, "columns"):
-            abund_names = set(
-                [
-                    name
-                    for name in csvy_model_data.columns
-                    if is_valid_nuclide_or_elem(name)
-                ]
-            )
+            abund_names = {
+                name
+                for name in csvy_model_data.columns
+                if is_valid_nuclide_or_elem(name)
+            }
             unsupported_columns = (
                 set(csvy_model_data.columns)
                 - abund_names
                 - CSVY_SUPPORTED_COLUMNS
             )
 
-            field_names = set(
-                [field["name"] for field in csvy_model_config.datatype.fields]
-            )
+            field_names = {
+                field["name"] for field in csvy_model_config.datatype.fields
+            }
             assert (
                 set(csvy_model_data.columns) - field_names == set()
             ), "CSVY columns exist without field descriptions"

tardis/model/geometry/radial1d.py

@@ -1,8 +1,9 @@
-from numba import float64
-from numba.experimental import jitclass
+import warnings
+
 import numpy as np
 from astropy import units as u
-import warnings
+from numba import float64
+from numba.experimental import jitclass
 
 
 class HomologousRadial1DGeometry:
@@ -193,7 +194,7 @@ def to_numba(self):
 
 
 @jitclass(numba_geometry_spec)
-class NumbaRadial1DGeometry(object):
+class NumbaRadial1DGeometry:
     def __init__(self, r_inner, r_outer, v_inner, v_outer):
         """
         Radial 1D Geometry for the Numba mode

tardis/model/geometry/tests/test_radial1d.py

@@ -1,11 +1,10 @@
-from astropy import units as u
 import numpy as np
 import numpy.testing as npt
+import pytest
+from astropy import units as u
 
 from tardis.model.geometry.radial1d import HomologousRadial1DGeometry
 
-import pytest
-
 
 @pytest.fixture(scope="function")
 def homologous_radial1d_geometry():

tardis/model/matter/decay.py

@@ -17,23 +17,23 @@ def __init__(self, *args, **kwargs):
             kwargs.pop("time_0")
         else:
             time_0 = 0 * u.d
-        super(IsotopicMassFraction, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.time_0 = time_0
 
     @property
     def _constructor(self):
         return IsotopicMassFraction
 
     def _update_inventory(self):
-        self.comp_dicts = [dict() for i in range(len(self.columns))]
+        self.comp_dicts = [{} for i in range(len(self.columns))]
         for (atomic_number, mass_number), mass_fractions in self.iterrows():
             nuclear_symbol = f"{Z_to_elem(atomic_number)}{mass_number}"
             for i in range(len(self.columns)):
                 self.comp_dicts[i][nuclear_symbol] = mass_fractions[i]
 
     @classmethod
     def from_inventories(cls, inventories):
-        multi_index_tuples = set([])
+        multi_index_tuples = set()
         for inventory in inventories:
             multi_index_tuples.update(
                 [cls.id_to_tuple(key) for key in inventory.contents.keys()]
@@ -68,7 +68,7 @@ def to_inventories(self, shell_masses=None):
         list
             list of radioactivedecay Inventories
         """
-        comp_dicts = [dict() for i in range(len(self.columns))]
+        comp_dicts = [{} for i in range(len(self.columns))]
         for (atomic_number, mass_number), abundances in self.iterrows():
             nuclear_symbol = f"{Z_to_elem(atomic_number)}{mass_number}"
             for i in range(len(self.columns)):

tardis/model/tests/test_base.py

@@ -1,7 +1,5 @@
-import os
-from pathlib import Path
-import pytest
 import pandas as pd
+import pytest
 from astropy import units as u
 from numpy.testing import assert_almost_equal, assert_array_almost_equal
 

tardis/model/tests/test_csvy_model.py

@@ -1,13 +1,10 @@
-from pathlib import Path
 import numpy as np
-import pandas as pd
 import numpy.testing as npt
+import pandas as pd
+import pytest
 
-from astropy import units as u
 from tardis.io.configuration.config_reader import Configuration
-from tardis.io.atom_data.base import AtomData
 from tardis.model import SimulationState
-import pytest
 
 
 @pytest.fixture(

tardis/model/tests/test_density.py

@@ -1,4 +1,3 @@
-import os
 import pandas as pd
 import pytest
 from numpy.testing import assert_almost_equal