Fix linting issues

Author: phumthep

.github/workflows/python-app.yml

@@ -34,9 +34,9 @@ jobs:
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names
-        flake8 . --ignore=E501,F401,W503,E266 --count --select=E9,F63,F7,F82 --show-source --statistics
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --ignore=E501,F401,W503,E266,C901 --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+        flake8 . --ignore=E501,W503,E266,C901 --count --exit-zero --max-complexity=10 --statistics
 
     - name: Unit testing
       run: |

pyproject.toml

@@ -33,6 +33,7 @@ dependencies = [
     "geopandas >= 1.0.1",
     "contextily >= 1.6.2",
     "coverage[toml] >= 7.8.0",
+    "flake8 >= 7.2.0",
 ]
 requires-python = ">=3.10"
 

src/pownet/core/data_processor.py

@@ -252,7 +252,7 @@ def create_cycle_map(self) -> None:
         )
         cycles = nx.cycle_basis(graph)
         # Save this map to be uses by ModelBuilder
-        self.cycle_map = {f"cycle_{idx+1}": cycle for idx, cycle in enumerate(cycles)}
+        self.cycle_map = {f"cycle_{idx + 1}": cycle for idx, cycle in enumerate(cycles)}
 
     def write_cycle_map(self) -> None:
         """

src/pownet/coupler.py

@@ -118,7 +118,7 @@ def reoperate(
             ):
                 reop_converge = True
                 logger.info(
-                    f"PowNet: Day {step_k+1} - Reservoirs converged at iteration {reop_k}"
+                    f"PowNet: Day {step_k + 1} - Reservoirs converged at iteration {reop_k}"
                 )
 
             logger.info("Max deviation:", max_deviation)

src/pownet/data_utils.py

@@ -24,7 +24,7 @@ def get_dates(year, num_days=365):
     # Remove 29th Feb because we do not deal with them
     dates = dates.loc[dates.date.dt.strftime("%m-%d") != "02-29"]
     # Remove 1st Jan of the next year in case it is included when it is not a leap year
-    dates = dates.loc[dates.date.dt.strftime("%Y-%m-%d") != f"{year+1}-01-01"]
+    dates = dates.loc[dates.date.dt.strftime("%Y-%m-%d") != f"{year + 1}-01-01"]
 
     # In case we need three columns: date, hour, and day
     dates = dates.loc[dates.index.repeat(24)]
@@ -35,7 +35,7 @@ def get_dates(year, num_days=365):
 
 def get_datetime_index(year: int) -> pd.DatetimeIndex:
     """Return a datetime index for the given year. The index will have 8760 entries, one for each hour of the year. Exclude 29th February."""
-    dates = pd.date_range(start=f"{year}-01-01", end=f"{year+1}-01-01", freq="h")
+    dates = pd.date_range(start=f"{year}-01-01", end=f"{year + 1}-01-01", freq="h")
     # Remove 29th February
     dates = dates[~((dates.month == 2) & (dates.day == 29))]
     return dates[dates.year == year]

src/pownet/input.py

@@ -912,7 +912,7 @@ def check_data(self):
         # Number of edges in the node_edge dictionary must be equal to TWICE the number of edges
         if sum(len(v) for v in self.node_edge.values()) != 2 * len(self.edges):
             raise ValueError(
-                f"PowNet: The number of edges in the node_edge dictionary must be equal to the number of edges. {sum(len(v) for v in self.node_edge.values())} != {2*len(self.edges)}"
+                f"PowNet: The number of edges in the node_edge dictionary must be equal to the number of edges. {sum(len(v) for v in self.node_edge.values())} != {2 * len(self.edges)}"
             )
 
         ##################################