PEP8 standard A002 (#247)

* A002 reenabled

* renamed type to table_type. Distinction necessary for simulation and measurement table

Author: PaulJonasJost

pyproject.toml

@@ -94,7 +94,6 @@ lint.ignore = [
     "T201",  # `print` found"
     "SIM105",  # Use `contextlib.suppress`
     "S110",  # `try`-`except`-`pass` detected, consider logging the exception
-    "A002",  # Function argument shadowing a Python builtin
     "E701",  # Multiple statements on one line (colon)
     "E741",  # Ambiguous variable name
 ]

src/petab_gui/commands.py

@@ -25,7 +25,7 @@ def _convert_dtype_with_nullable_int(series, dtype):
     # Check if it's already a pandas nullable int type
     is_pandas_nullable_int = isinstance(
         dtype,
-        (pd.Int64Dtype, pd.Int32Dtype, pd.Int16Dtype, pd.Int8Dtype),
+        pd.Int64Dtype | pd.Int32Dtype | pd.Int16Dtype | pd.Int8Dtype,
     )
 
     if is_pandas_nullable_int:
@@ -306,7 +306,7 @@ def _apply_changes(self, use_new: bool):
             # For numeric types, convert string inputs to numbers first
             is_pandas_nullable_int = isinstance(
                 dtype,
-                (pd.Int64Dtype, pd.Int32Dtype, pd.Int16Dtype, pd.Int8Dtype),
+                pd.Int64Dtype | pd.Int32Dtype | pd.Int16Dtype | pd.Int8Dtype,
             )
             if is_pandas_nullable_int or np.issubdtype(dtype, np.number):
                 df[col] = pd.to_numeric(df[col], errors="coerce")

src/petab_gui/models/pandas_table_model.py

@@ -1127,12 +1127,14 @@ class MeasurementModel(PandasTableModel):
     possibly_new_condition = Signal(str)  # Signal for new condition
     possibly_new_observable = Signal(str)  # Signal for new observable
 
-    def __init__(self, data_frame, type: str = "measurement", parent=None):
-        allowed_columns = COLUMNS[type].copy()
+    def __init__(
+        self, data_frame, table_type: str = "measurement", parent=None
+    ):
+        allowed_columns = COLUMNS[table_type].copy()
         super().__init__(
             data_frame=data_frame,
             allowed_columns=allowed_columns,
-            table_type=type,
+            table_type=table_type,
             parent=parent,
         )
 

src/petab_gui/models/petab_model.py

@@ -62,11 +62,11 @@ def __init__(
         )
         self.measurement = MeasurementModel(
             data_frame=self.problem.measurement_df,
-            type="measurement",
+            table_type="measurement",
         )
         self.simulation = MeasurementModel(
             data_frame=None,
-            type="simulation",
+            table_type="simulation",
         )
         self.observable = ObservableModel(
             data_frame=self.problem.observable_df,