From 66aae0a5a0acd20dba989fcbc4337fbe8b301079 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 03:10:58 +0000 Subject: [PATCH] CI(deps): Update ruff to v0.7.3 (#4672) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * CI(deps): Update ruff to v0.7.3 * style: Ignore PYI066 on non-stub files. Doesn't seem idiomatic and not understood by Pyright. * style: Fix split-static-string (SIM905) Ruff rule: https://docs.astral.sh/ruff/rules/split-static-string/ * style: Ignore subclass-builtin (FURB189) in two files, as expected change is not guaranteed to be equivalent --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Edouard Choinière <27212526+echoix@users.noreply.github.com> --- .github/workflows/python-code-quality.yml | 2 +- .pre-commit-config.yaml | 2 +- pyproject.toml | 4 +++- scripts/d.correlate/d.correlate.py | 2 +- scripts/db.dropcolumn/db.dropcolumn.py | 3 ++- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/python-code-quality.yml b/.github/workflows/python-code-quality.yml index 55a62f4cb7e..e1676d179fa 100644 --- a/.github/workflows/python-code-quality.yml +++ b/.github/workflows/python-code-quality.yml @@ -36,7 +36,7 @@ jobs: # renovate: datasource=pypi depName=bandit BANDIT_VERSION: "1.7.10" # renovate: datasource=pypi depName=ruff - RUFF_VERSION: "0.7.2" + RUFF_VERSION: "0.7.3" runs-on: ${{ matrix.os }} permissions: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fd6d6c67f50..712342dc83a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -37,7 +37,7 @@ repos: ) - repo: https://github.com/astral-sh/ruff-pre-commit # Ruff version. - rev: v0.7.2 + rev: v0.7.3 hooks: # Run the linter. - id: ruff diff --git a/pyproject.toml b/pyproject.toml index d739653809e..c9f621a679f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -261,6 +261,7 @@ ignore = [ # "A005", # builtin-module-shadowing # "PLW0108", # unnecessary-lambda # Ignore `E402` (import violations) in all `__init__.py` files +"**.py" = ["PYI066"] "*/testsuite/**.py" = ["PT009", "PT027"] "__init__.py" = ["E402"] "display/d.mon/render_cmd.py" = ["SIM115"] @@ -317,6 +318,7 @@ ignore = [ "python/grass/pygrass/modules/grid/testsuite/test_*_modules_grid_doctests.py" = ["F401"] "python/grass/pygrass/modules/interface/env.py" = ["SIM115"] "python/grass/pygrass/modules/testsuite/test_pygrass_modules_doctests.py" = ["F401"] +"python/grass/pygrass/raster/category.py" = ["FURB189"] "python/grass/pygrass/raster/segment.py" = ["SIM115"] "python/grass/pygrass/tests/*.py" = ["SIM115"] "python/grass/pygrass/vector/geometry.py" = ["PYI024"] @@ -326,7 +328,7 @@ ignore = [ "python/grass/script/core.py" = ["SIM115"] "python/grass/script/db.py" = ["SIM115"] "python/grass/script/raster.py" = ["SIM115"] -"python/grass/script/utils.py" = ["SIM115"] +"python/grass/script/utils.py" = ["FURB189", "SIM115"] "python/grass/temporal/aggregation.py" = ["SIM115"] "python/grass/temporal/register.py" = ["SIM115"] "python/grass/temporal/stds_export.py" = ["SIM115"] diff --git a/scripts/d.correlate/d.correlate.py b/scripts/d.correlate/d.correlate.py index 1068733a11b..af0f1840356 100755 --- a/scripts/d.correlate/d.correlate.py +++ b/scripts/d.correlate/d.correlate.py @@ -54,7 +54,7 @@ def main(): os.environ["GRASS_RENDER_FILE_READ"] = "TRUE" - colors = "red black blue green gray violet".split() + colors = ["red", "black", "blue", "green", "gray", "violet"] line = 2 iloop = 0 jloop = 0 diff --git a/scripts/db.dropcolumn/db.dropcolumn.py b/scripts/db.dropcolumn/db.dropcolumn.py index 24681b18b23..e038deda38a 100755 --- a/scripts/db.dropcolumn/db.dropcolumn.py +++ b/scripts/db.dropcolumn/db.dropcolumn.py @@ -102,7 +102,8 @@ def main(): driver=driver, ).split(".")[0:2] - if [int(i) for i in sqlite3_version] >= [int(i) for i in "3.35".split(".")]: + # sqlite version 3.35 compared here + if [int(i) for i in sqlite3_version] >= [int(i) for i in ["3", "35"]]: sql = "ALTER TABLE %s DROP COLUMN %s" % (table, column) if column == "cat": sql = "DROP INDEX %s_%s; %s" % (table, column, sql)