From da5a9d9025fffbea7bb049a50c28554dcd91c21f Mon Sep 17 00:00:00 2001 From: Santiago Figueroa Manrique Date: Tue, 7 Jan 2025 16:10:30 +0100 Subject: [PATCH 1/5] ignore false positive Signed-off-by: Santiago Figueroa Manrique --- src/power_grid_model_io/functions/filters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/power_grid_model_io/functions/filters.py b/src/power_grid_model_io/functions/filters.py index 896abe70..38f196ef 100644 --- a/src/power_grid_model_io/functions/filters.py +++ b/src/power_grid_model_io/functions/filters.py @@ -31,8 +31,8 @@ def exclude_value(row: pd.Series, col: str, value: Union[float, str]) -> bool: if col not in row: raise ValueError(f"The column: '{col}' cannot be found for the filter") result = row[col] != value - if isinstance(result, pd.Series): - return result.item() + if isinstance(result, pd.Series): # sonar-ignore: S2583 + return result.item() # sonar-ignore: S2583 return result From f67f33ac1109c41cdf92547069ee728d0d6b9698 Mon Sep 17 00:00:00 2001 From: Santiago Figueroa Manrique Date: Tue, 7 Jan 2025 16:16:05 +0100 Subject: [PATCH 2/5] bumped to sonarqube Signed-off-by: Santiago Figueroa Manrique --- .github/workflows/build-test-and-sonar.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test-and-sonar.yml b/.github/workflows/build-test-and-sonar.yml index 3e323dda..759cf16f 100644 --- a/.github/workflows/build-test-and-sonar.yml +++ b/.github/workflows/build-test-and-sonar.yml @@ -96,7 +96,7 @@ jobs: - name: SonarCloud Scan if: ${{ (github.event_name == 'push') || (github.event.pull_request.head.repo.owner.login == 'PowerGridModel') }} - uses: SonarSource/sonarcloud-github-action@master + uses: SonarSource/sonarqube-scan-action@master env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} From 96692c089f7788fd3712ea365f56cba8907c0f07 Mon Sep 17 00:00:00 2001 From: Santiago Figueroa Manrique Date: Tue, 7 Jan 2025 16:26:24 +0100 Subject: [PATCH 3/5] format Signed-off-by: Santiago Figueroa Manrique --- src/power_grid_model_io/functions/filters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/power_grid_model_io/functions/filters.py b/src/power_grid_model_io/functions/filters.py index 38f196ef..bb5d483e 100644 --- a/src/power_grid_model_io/functions/filters.py +++ b/src/power_grid_model_io/functions/filters.py @@ -31,8 +31,8 @@ def exclude_value(row: pd.Series, col: str, value: Union[float, str]) -> bool: if col not in row: raise ValueError(f"The column: '{col}' cannot be found for the filter") result = row[col] != value - if isinstance(result, pd.Series): # sonar-ignore: S2583 - return result.item() # sonar-ignore: S2583 + if isinstance(result, pd.Series): # sonar-ignore: S2583 + return result.item() # sonar-ignore: S2583 return result From e9911cc6bd05a33909ba67d53f90a339f6ea2b74 Mon Sep 17 00:00:00 2001 From: Santiago Figueroa Manrique Date: Wed, 8 Jan 2025 09:57:13 +0100 Subject: [PATCH 4/5] address comment Signed-off-by: Santiago Figueroa Manrique --- src/power_grid_model_io/functions/filters.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/power_grid_model_io/functions/filters.py b/src/power_grid_model_io/functions/filters.py index bb5d483e..1c39d93a 100644 --- a/src/power_grid_model_io/functions/filters.py +++ b/src/power_grid_model_io/functions/filters.py @@ -31,8 +31,9 @@ def exclude_value(row: pd.Series, col: str, value: Union[float, str]) -> bool: if col not in row: raise ValueError(f"The column: '{col}' cannot be found for the filter") result = row[col] != value + # Sonar cloud false positive: result can be a pd.Series of bool if isinstance(result, pd.Series): # sonar-ignore: S2583 - return result.item() # sonar-ignore: S2583 + return result.item() return result From faa51a64f867ce5b57d63246524d255b5406afd6 Mon Sep 17 00:00:00 2001 From: Santiago Figueroa Manrique Date: Wed, 8 Jan 2025 10:10:52 +0100 Subject: [PATCH 5/5] fixed #NOSONAR Signed-off-by: Santiago Figueroa Manrique --- src/power_grid_model_io/functions/filters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/power_grid_model_io/functions/filters.py b/src/power_grid_model_io/functions/filters.py index 1c39d93a..09b142b6 100644 --- a/src/power_grid_model_io/functions/filters.py +++ b/src/power_grid_model_io/functions/filters.py @@ -31,8 +31,8 @@ def exclude_value(row: pd.Series, col: str, value: Union[float, str]) -> bool: if col not in row: raise ValueError(f"The column: '{col}' cannot be found for the filter") result = row[col] != value - # Sonar cloud false positive: result can be a pd.Series of bool - if isinstance(result, pd.Series): # sonar-ignore: S2583 + # Sonar cloud false positive (S2583): result can be a pd.Series of bool + if isinstance(result, pd.Series): # NOSONAR return result.item() return result