Merge branch 'main' into fix-RET506-RET507-RET508-superfluous-else

.flake8

@@ -15,20 +15,17 @@ per-file-ignores =
     # E501 line too long
     # E722 do not use bare 'except'
     # W605 invalid escape sequence
-    # F401 imported but unused
     # F821 undefined name 'unicode'
     # F841 local variable assigned to but never used
     # E741 ambiguous variable name 'l'
-    __init__.py: F401, F403
+    __init__.py: F403
     man/build_html.py: E501
     doc/python/m.distance.py: E501
     gui/scripts/d.wms.py: E501
     gui/wxpython/image2target/g.gui.image2target.py: E501
-    gui/wxpython/modules/*: F841, E722
-    gui/wxpython/nviz/*: E722, F403, F405
-    gui/wxpython/photo2image/*: F841, E722, E265
-    gui/wxpython/photo2image/g.gui.photo2image.py: E501, F841
-    gui/wxpython/psmap/*: F841, E266, E722
+    gui/wxpython/nviz/*: E722
+    gui/wxpython/photo2image/g.gui.photo2image.py: E501
+    gui/wxpython/psmap/*: E501, E722
     gui/wxpython/vdigit/*: F841, E722, F405, F403
     gui/wxpython/animation/g.gui.animation.py: E501
     gui/wxpython/tplot/frame.py: F841, E722
@@ -67,10 +64,8 @@ per-file-ignores =
     python/grass/pygrass/vector/__init__.py: E402
     python/grass/pygrass/raster/__init__.py: E402
     python/grass/pygrass/vector/__init__.py: E402
-    python/grass/pygrass/modules/interface/*.py: F401
-    python/grass/pygrass/modules/grid/*.py: F401
     python/grass/pygrass/raster/category.py: E721
-    python/grass/pygrass/rpc/__init__.py: F401, F403
+    python/grass/pygrass/rpc/__init__.py: F403
     python/grass/pygrass/utils.py: E402
     python/grass/temporal/abstract_space_time_dataset.py: E722
     python/grass/temporal/c_libraries_interface.py: E722
@@ -83,17 +78,16 @@ per-file-ignores =
     python/grass/temporal/temporal_topology_dataset_connector.py: E722
     # Current benchmarks/tests are changing sys.path before import.
     # Possibly, a different approach should be taken there anyway.
-    python/grass/pygrass/tests/benchmark.py: E402, F401, F821
+    python/grass/pygrass/tests/benchmark.py: E402, F821
     # Configuration file for Sphinx:
     # Ignoring import/code mix and line length.
     # Files not managed by Black
     python/grass/imaging/images2gif.py: E226
     # Unused imports in init files
-    # F401 imported but unused
     # F403 star import used; unable to detect undefined names
     python/grass/*/__init__.py: F401, F403
-    python/grass/*/*/__init__.py: F401, F403
-    python/grass/*/*/*/__init__.py: F401, F403
+    python/grass/*/*/__init__.py: F403
+    python/grass/*/*/*/__init__.py: F403
     # E402 module level import not at top of file
     scripts/r.in.wms/wms_gdal_drv.py: E722
     scripts/r.in.wms/wms_drv.py: E402, E722
@@ -107,16 +101,12 @@ per-file-ignores =
     scripts/db.univar/db.univar.py: E501
     scripts/d.frame/d.frame.py: E722
     scripts/i.pansharpen/i.pansharpen.py: E722, E501
-    scripts/r.in.srtm/r.in.srtm.py: E722
-    scripts/r.fillnulls/r.fillnulls.py: E722
-    scripts/d.rast.edit/d.rast.edit.py: E722
     scripts/v.what.strds/v.what.strds.py: E501
     # Line too long (esp. module interface definitions)
     scripts/*/*.py: E501
     temporal/t.rast.to.vect/t.rast.to.vect.py: E501
     temporal/t.vect.algebra/t.vect.algebra.py: E501
-    # ## used (##% key: r etc)
-    temporal/t.rast.what/t.rast.what.py: E265, E266, E501
+    temporal/t.rast.what/t.rast.what.py: E501
     # Line too long (esp. module interface definitions)
     temporal/*/*.py: E501
 

.github/workflows/additional_checks.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout repository contents
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 31
 
@@ -43,7 +43,7 @@ jobs:
           exclude: mswindows .*\.bat .*/testsuite/data/.*
 
       - name: Set up Python
-        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
+        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
         with:
           python-version: '3.10'
 

.github/workflows/clang-format-check.yml

@@ -16,7 +16,7 @@ jobs:
     name: Formatting Check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - uses: DoozyX/clang-format-lint-action@c71d0bf4e21876ebec3e5647491186f8797fde31 # v0.18.2

.github/workflows/codeql-analysis.yml

@@ -40,9 +40,9 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Set up Python
-        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
+        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
         with:
           python-version: '3.x'
       - name: Install non-Python dependencies
@@ -56,7 +56,7 @@ jobs:
         if: ${{ matrix.language == 'c-cpp' }}
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
+        uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql/codeql-config.yml
@@ -81,6 +81,6 @@ jobs:
         run: .github/workflows/build_ubuntu-22.04.sh "${HOME}/install"
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
+        uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/coverity.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-22.04
     if: github.repository == 'OSGeo/grass'
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Get dependencies
         run: |

.github/workflows/create_release_draft.yml

@@ -30,12 +30,12 @@ jobs:
       contents: write
     steps:
       - name: Checks-out repository
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.ref }}
           fetch-depth: 0
       - name: Set up Python
-        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
+        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
         with:
           python-version: '3.11'
       - name: Create output directory

.github/workflows/docker.yml

@@ -49,7 +49,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 0
       - name: Docker meta

.github/workflows/gcc.yml

@@ -26,7 +26,7 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Get dependencies
         run: |
           sudo apt-get update -y

.github/workflows/macos.yml

@@ -44,7 +44,7 @@ jobs:
             -mindepth 1 -maxdepth 1 -type f -print -delete
           # Rehash to forget about the deleted files
           hash -r
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Get current date cache key segment
         id: date
         # Year and week of year so cache key changes weekly

.github/workflows/osgeo4w.yml

@@ -31,7 +31,7 @@ jobs:
         run: |
           git config --global core.autocrlf false
           git config --global core.eol lf
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: msys2/setup-msys2@ddf331adaebd714795f1042345e6ca57bd66cea8 # v2.24.1
         with:
           path-type: inherit

.github/workflows/periodic_update.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Create URL to the run output
         id: vars
         run: echo "run-url=https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" >> $GITHUB_OUTPUT
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: "Check that autoconf scripts are up-to-date:"
         run: |
           rm -f config.guess config.sub

.github/workflows/pytest.yml

@@ -32,10 +32,10 @@ jobs:
       PYTHONWARNINGS: always
 
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Set up Python
-        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
+        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
         with:
           python-version: ${{ matrix.python-version }}
           cache: pip

.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.0"
+      RUFF_VERSION: "0.7.1"
 
     runs-on: ${{ matrix.os }}
     permissions:
@@ -54,10 +54,10 @@ jobs:
           echo Bandit: ${{ env.BANDIT_VERSION }}
           echo Ruff: ${{ env.RUFF_VERSION }}
 
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Set up Python
-        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
+        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           cache: pip
@@ -135,7 +135,7 @@ jobs:
           path: bandit.sarif
 
       - name: Upload SARIF File into Security Tab
-        uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
+        uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
         with:
           sarif_file: bandit.sarif
 

.github/workflows/super-linter.yml

@@ -25,7 +25,7 @@ jobs:
       statuses: write
 
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           # super-linter needs the full git history to get the
           # list of files that changed across commits

.github/workflows/test-nix.yml

@@ -28,7 +28,7 @@ jobs:
       contents: read
 
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Install nix
         uses: DeterminateSystems/nix-installer-action@da36cb69b1c3247ad7a1f931ebfd954a1105ef14 # v14

.github/workflows/titles.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout base repository (doesn't include the PR changes)
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Call PR title validation function
         run: python utils/generate_release_notes.py check "${PR_TITLE}" "" ""
         env:

.github/workflows/ubuntu.yml

@@ -59,7 +59,7 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Invert inclusion list to an exclusion list
         id: get-exclude

.pre-commit-config.yaml

@@ -37,7 +37,7 @@ repos:
           )
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.7.0
+    rev: v0.7.1
     hooks:
       # Run the linter.
       - id: ruff

AUTHORS

@@ -206,7 +206,7 @@ MS-Windows/Cygwin:  Huidae Cho <grass4u gmail com>
 Source code Quality assessment system
  - SOCCER Labs at Ecole Polytechnique de Montreal, Canada
    http://web.soccerlab.polymtl.ca/grass-evolution/grass-browsers/grass-index-en.html
-   http://lists.osgeo.org/mailman/listinfo/grass-qa
+   https://lists.osgeo.org/mailman/listinfo/grass-qa
 
 
 GRASS 5.7/6.0: Primary authors of new source code

REQUIREMENTS.md

@@ -49,7 +49,7 @@ Note: also the respective development packages (commonly named `xxx-dev` or
   [https://facebook.github.io/zstd](https://facebook.github.io/zstd)
 - **FFTW 2.x or 3.x** (library for computing the Discrete Fourier Transform),
   required for `i.fft` and `i.ifft` and other modules
-  [http://www.fftw.org](http://www.fftw.org)
+  [https://fftw.org](https://fftw.org)
 - **GEOS** (Geometry Engine library),
   needed for `v.buffer` and adds extended options to the `v.select` module
   [https://libgeos.org/](https://libgeos.org/)
@@ -81,7 +81,7 @@ Note: also the respective development packages (commonly named `xxx-dev` or
 - **SQLite libraries** (for the SQLite database interface)
   [https://www.sqlite.org](https://www.sqlite.org)
 - **unixODBC** (for the ODBC database interface)
-  [http://www.unixodbc.org](http://www.unixodbc.org)
+  [https://www.unixodbc.org](https://www.unixodbc.org)
 - **R Statistics** (for the R statistical language interface)
   [https://cran.r-project.org](https://cran.r-project.org)
 - **FreeType2** (for TrueType font support and `d.text.freetype`)

TODO

@@ -39,6 +39,6 @@ Imagery
 -----------------
 See also
 
-http://trac.osgeo.org/grass/wiki/Grass7Planning
+https://trac.osgeo.org/grass/wiki/Grass7Planning
 
-http://trac.osgeo.org/grass/wiki/Grass8Planning
+https://trac.osgeo.org/grass/wiki/Grass8Planning

binaryInstall.src

@@ -109,7 +109,7 @@ if [ $? -eq 0 ] ; then
     IFS="$IFSSAVE"
     if [ ! "$GUNZIP" ] ; then
         echo "No gunzip installed. Please get from:"
-        echo "   http://www.gnu.org/software/gzip/gzip.html"
+        echo "   https://www.gnu.org/software/gzip/gzip.html"
         exit
     fi
 else

configure.ac

@@ -15,7 +15,7 @@
 #		Public License (>=v2). Read the file COPYING that
 #		comes with GRASS for details.
 #
-# MANUAL:       http://www.gnu.org/software/autoconf/manual/autoconf.html
+# MANUAL:       https://www.gnu.org/software/autoconf/manual/autoconf.html
 #               http://savannah.gnu.org/projects/autoconf/
 # Website for   config.guess, config.sub:
 #               wget http://git.savannah.gnu.org/cgit/config.git/plain/config.guess

db/db.login/main.c

@@ -98,9 +98,9 @@ int main(int argc, char *argv[])
         exit(EXIT_SUCCESS);
     }
 
-    if (db_set_login2(driver->answer, database->answer, user->answer,
-                      password->answer, host->answer, port->answer,
-                      G_get_overwrite()) == DB_FAILED) {
+    if (db_set_login(driver->answer, database->answer, user->answer,
+                     password->answer, host->answer, port->answer,
+                     G_get_overwrite()) == DB_FAILED) {
         G_fatal_error(_("Unable to set user/password"));
     }
 

db/drivers/mysql/db.c

@@ -51,7 +51,7 @@ int db__driver_open_database(dbHandle *handle)
                 connpar.host, connpar.port, connpar.dbname, connpar.user,
                 connpar.password);
 
-        db_get_login2("mysql", name, &user, &password, &host, &port);
+        db_get_login("mysql", name, &user, &password, &host, &port);
 
         connection = mysql_init(NULL);
         res =

db/drivers/mysql/grass-mesql.html

@@ -83,7 +83,7 @@ <h2>AUTHOR</h2>
 
 <p>
 Credits: Development of the driver was sponsored by
-<a href="http://www.faunalia.it">Faunalia</a> (Italy)
+<a href="https://www.faunalia.it">Faunalia</a> (Italy)
 as part of a project for <a href="http://www.atac.roma.it/">ATAC</a>.
 
 

db/drivers/mysql/grass-mysql.html

@@ -116,7 +116,7 @@ <h2>SEE ALSO</h2>
 <h2>Credits</h2>
 
 Development of the driver was sponsored by
-<a href="http://www.faunalia.it">Faunalia</a> (Italy)
+<a href="https://www.faunalia.it">Faunalia</a> (Italy)
 as part of a project for <a href="http://www.atac.roma.it/">ATAC</a>.
 
 <h2>AUTHOR</h2>

db/drivers/odbc/INSTALL

@@ -1,4 +1,4 @@
-1. Download, compile, install and configure ODBC (http://www.unixodbc.org/)
+1. Download, compile, install and configure ODBC (https://www.unixodbc.org/)
 2. Copy ODBC include files to /usr/include/odbc
 3. Compile src/libes/dbmi/drivers/odbc
 4. Add row for ODBC driver to dbmscap file