Fix issue with black and mypy 1.0 (#393)

pyscal/factory.py

@@ -931,7 +931,7 @@ def create_wateroilgas_list(
             PyscalList, consisting of WaterOilGas objects
         """
         wogl = PyscalList()
-        for (row_idx, params) in relperm_params_df.sort_values("SATNUM").iterrows():
+        for row_idx, params in relperm_params_df.sort_values("SATNUM").iterrows():
             if h is not None:
                 params["h"] = h
             try:
@@ -959,7 +959,7 @@ def create_wateroil_list(
             PyscalList, consisting of WaterOil objects
         """
         wol = PyscalList()
-        for (_, params) in relperm_params_df.iterrows():
+        for _, params in relperm_params_df.iterrows():
             if h is not None:
                 params["h"] = h
             try:
@@ -987,7 +987,7 @@ def create_gasoil_list(
             PyscalList, consisting of GasOil objects
         """
         gol = PyscalList()
-        for (_, params) in relperm_params_df.iterrows():
+        for _, params in relperm_params_df.iterrows():
             if h is not None:
                 params["h"] = h
             try:
@@ -1015,7 +1015,7 @@ def create_gaswater_list(
             PyscalList, consisting of GasWater objects
         """
         gwl = PyscalList()
-        for (_, params) in relperm_params_df.iterrows():
+        for _, params in relperm_params_df.iterrows():
             if h is not None:
                 params["h"] = h
             try:

pyscal/gasoil.py

@@ -147,9 +147,7 @@ def __init__(
         )
         sg_list.sort()
         self.table = pd.DataFrame(sg_list, columns=["SG"])
-        self.table["sgint"] = list(
-            map(int, list(map(round, self.table["SG"] * SWINTEGERS)))
-        )
+        self.table["sgint"] = list(map(round, self.table["SG"] * SWINTEGERS))
         self.table.drop_duplicates("sgint", inplace=True)
 
         # Now sg=1-sorg-swl might be accidentally dropped, so make sure we

pyscal/pyscallist.py

@@ -102,7 +102,7 @@ def df(self) -> pd.DataFrame:
 
         df_list = []
         if self.pyscaltype == WaterOilGas:
-            for (satnum, wateroilgas) in enumerate(self.pyscal_list):
+            for satnum, wateroilgas in enumerate(self.pyscal_list):
                 assert isinstance(wateroilgas, WaterOilGas)
                 assert wateroilgas.wateroil is not None
                 assert wateroilgas.gasoil is not None
@@ -127,7 +127,7 @@ def df(self) -> pd.DataFrame:
                     .rename(wateroil_col_renamer, axis="columns")
                 )
         elif self.pyscaltype == SCALrecommendation:
-            for (satnum, scalrec) in enumerate(self.pyscal_list):
+            for satnum, scalrec in enumerate(self.pyscal_list):
                 assert isinstance(scalrec, SCALrecommendation)
                 assert scalrec.low is not None
                 assert scalrec.base is not None
@@ -180,7 +180,7 @@ def df(self) -> pd.DataFrame:
                     .rename(wateroil_col_renamer, axis="columns")
                 )
         elif self.pyscaltype == WaterOil:
-            for (satnum, wateroil) in enumerate(self.pyscal_list):
+            for satnum, wateroil in enumerate(self.pyscal_list):
                 assert isinstance(wateroil, WaterOil)
                 assert wateroil is not None
                 wateroil_cols = list(
@@ -192,7 +192,7 @@ def df(self) -> pd.DataFrame:
                     .rename(wateroil_col_renamer, axis="columns")
                 )
         elif self.pyscaltype == GasOil:
-            for (satnum, gasoil) in enumerate(self.pyscal_list):
+            for satnum, gasoil in enumerate(self.pyscal_list):
                 assert isinstance(gasoil, GasOil)
                 assert gasoil is not None
                 gasoil_cols = list(
@@ -369,7 +369,7 @@ def interpolate(
                 f"Too many interpolation parameters given for GasOil {int_params_go}"
             )
         wog_list: PyscalList = PyscalList()
-        for (satnum, scalrec) in enumerate(self.pyscal_list):
+        for satnum, scalrec in enumerate(self.pyscal_list):
             assert isinstance(scalrec, SCALrecommendation)
             wog_list.append(
                 scalrec.interpolate(int_params_wo[satnum], int_params_go[satnum], h=h)

pyscal/scalrecommendation.py

@@ -55,7 +55,6 @@ def __init__(
             and isinstance(base, WaterOilGas)
             and isinstance(high, WaterOilGas)
         ):
-
             self.low = low
             self.base = base
             self.high = high
@@ -65,7 +64,6 @@ def __init__(
             and isinstance(base, GasWater)
             and isinstance(high, GasWater)
         ):
-
             self.low = low
             self.base = base
             self.high = high

pyscal/wateroil.py

@@ -149,9 +149,7 @@ def __init__(
 
         # Ensure that we do not have sw values that are too close
         # to each other, determined rougly by the distance 1/10000
-        self.table["swint"] = list(
-            map(int, list(map(round, self.table["SW"] * SWINTEGERS)))
-        )
+        self.table["swint"] = list(map(round, self.table["SW"] * SWINTEGERS))
         self.table.drop_duplicates("swint", inplace=True)
 
         # Now, sw=1-sorw might be accidentaly dropped, so make sure we

pyscal/wateroilgas.py

@@ -165,9 +165,7 @@ def SOF3(self, header: bool = True, dataincommentrow: bool = True) -> str:
             .fillna(method="bfill")
             .reset_index()
         )
-        sof3table["soint"] = list(
-            map(int, list(map(round, sof3table["SO"] * SWINTEGERS)))
-        )
+        sof3table["soint"] = list(map(round, sof3table["SO"] * SWINTEGERS))
         sof3table.drop_duplicates("soint", inplace=True)
 
         # The 'so' column has been calculated from floating point numbers

tests/test_factory.py

@@ -813,7 +813,7 @@ def test_xls_factory():
 
     scalinput = pd.read_excel(xlsxfile, engine="openpyxl").set_index(["SATNUM", "CASE"])
 
-    for ((satnum, _), params) in scalinput.iterrows():
+    for (satnum, _), params in scalinput.iterrows():
         assert satnum
         wog = PyscalFactory.create_water_oil_gas(params.to_dict())
         swof = wog.SWOF()
@@ -961,7 +961,6 @@ def test_scalrecommendation():
     with pytest.raises(
         ValueError, match="All values in parameter dict must be dictionaries"
     ):
-
         pyscal_factory.create_scal_recommendation(
             {"low": [1, 2], "base": {"swl": 0.1}, "high": {"swl": 0.1}}
         )
@@ -1069,7 +1068,7 @@ def parse_gensatfuncline(conf_line):
         raise ValueError("Too many items on gensatfunc confline")
 
     params = {}
-    for (idx, value) in enumerate(conf_line.split()):
+    for idx, value in enumerate(conf_line.split()):
         if idx > 0:  # Avoid the CMD
             params[line_syntax[idx]] = float(value)