Merge branch 'main' into r.circle-test

OSGeo · Nov 5, 2024 · da1452f · da1452f
2 parents 73576c7 + d4bb783
commit da1452f
Show file tree

Hide file tree

Showing 416 changed files with 2,295 additions and 2,596 deletions.
diff --git a/.flake8 b/.flake8
@@ -15,19 +15,16 @@ 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/nviz/*: E722
-    gui/wxpython/photo2image/*: F841, E722, E265
-    gui/wxpython/photo2image/g.gui.photo2image.py: E501, F841
-    gui/wxpython/psmap/*: F841, E266, 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
@@ -66,10 +63,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
@@ -82,32 +77,24 @@ 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
-    scripts/r.in.wms/srs.py: E722
     scripts/r.semantic.label/r.semantic.label.py: E501
-    scripts/v.report/v.report.py: E721
     scripts/db.out.ogr/db.out.ogr.py: F841
-    scripts/g.extension/g.extension.py: F841, E722, E501
-    scripts/v.unpack/v.unpack.py: E722, E501
-    scripts/v.import/v.import.py: E722, E501
+    scripts/g.extension/g.extension.py: E501
+    scripts/v.unpack/v.unpack.py: E501n
+    scripts/v.import/v.import.py: E501
     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/i.pansharpen/i.pansharpen.py: E501
     scripts/v.what.strds/v.what.strds.py: E501
     # Line too long (esp. module interface definitions)
     scripts/*/*.py: E501

diff --git a/.github/workflows/additional_checks.yml b/.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'
 

diff --git a/.github/workflows/build_ubuntu-22.04.sh b/.github/workflows/build_ubuntu-22.04.sh
@@ -31,26 +31,26 @@ set -u
 export INSTALL_PREFIX=$1
 
 ./configure \
-    --prefix="$INSTALL_PREFIX/" \
     --enable-largefile \
-    --with-cxx \
-    --with-zstd \
-    --with-bzlib \
+    --prefix="$INSTALL_PREFIX/" \
     --with-blas \
+    --with-bzlib \
+    --with-cxx \
+    --with-fftw \
+    --with-freetype \
+    --with-freetype-includes="/usr/include/freetype2/" \
+    --with-geos \
     --with-lapack \
     --with-libsvm \
-    --with-readline \
+    --with-netcdf \
     --with-openmp \
     --with-pdal \
-    --with-pthread \
-    --with-tiff \
-    --with-freetype \
-    --with-freetype-includes="/usr/include/freetype2/" \
     --with-proj-share=/usr/share/proj \
-    --with-geos \
+    --with-pthread \
+    --with-readline \
     --with-sqlite \
-    --with-fftw \
-    --with-netcdf
+    --with-tiff \
+    --with-zstd
 
 eval $makecmd
 make install
diff --git a/.github/workflows/build_ubuntu-22.04_without_x.sh b/.github/workflows/build_ubuntu-22.04_without_x.sh
@@ -30,25 +30,25 @@ set -u
 export INSTALL_PREFIX=$1
 
 ./configure \
-    --prefix="$INSTALL_PREFIX/" \
     --enable-largefile \
-    --with-cxx \
-    --with-zstd \
-    --with-bzlib \
+    --prefix="$INSTALL_PREFIX/" \
     --with-blas \
-    --with-lapack \
-    --with-readline \
-    --without-openmp \
-    --with-pdal \
-    --without-pthread \
-    --with-tiff \
+    --with-bzlib \
+    --with-cxx \
+    --with-fftw \
     --with-freetype \
     --with-freetype-includes="/usr/include/freetype2/" \
-    --with-proj-share=/usr/share/proj \
     --with-geos \
+    --with-lapack \
+    --with-netcdf \
+    --with-pdal \
+    --with-proj-share=/usr/share/proj \
+    --with-readline \
     --with-sqlite \
-    --with-fftw \
-    --with-netcdf
+    --with-tiff \
+    --with-zstd \
+    --without-openmp \
+    --without-pthread
 
 eval $makecmd
 make install
diff --git a/.github/workflows/clang-format-check.yml b/.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

diff --git a/.github/workflows/codeql-analysis.yml b/.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}}"
diff --git a/.github/workflows/coverity.yml b/.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: |
@@ -58,25 +58,26 @@ jobs:
           echo "CFLAGS=${{ env.CFLAGS }}" >> $GITHUB_ENV
           echo "CXXFLAGS=${{ env.CXXFLAGS }}" >> $GITHUB_ENV
           ./configure \
-              --prefix="$HOME/install/" \
               --enable-largefile \
-              --with-cxx \
-              --with-zstd \
-              --with-bzlib \
+              --prefix="$HOME/install/" \
               --with-blas \
-              --with-lapack \
-              --with-readline \
-              --without-openmp \
-              --with-pdal \
-              --without-pthread \
-              --with-tiff \
+              --with-bzlib \
+              --with-cxx \
+              --with-fftw \
               --with-freetype \
               --with-freetype-includes="/usr/include/freetype2/" \
-              --with-proj-share=/usr/share/proj \
               --with-geos \
+              --with-lapack \
+              --with-netcdf \
+              --with-pdal \
+              --with-proj-share=/usr/share/proj \
+              --with-readline \
               --with-sqlite \
-              --with-fftw \
-              --with-netcdf
+              --with-tiff \
+              --with-zstd \
+              --without-openmp \
+              --without-pthread
+
         env:
           CFLAGS: -fPIC -g
           CXXFLAGS: -fPIC -g

diff --git a/.github/workflows/create_release_draft.yml b/.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
@@ -73,7 +73,7 @@ jobs:
           sha256sum ${{ env.GRASS }}.tar.xz > ${{ env.GRASS }}.tar.xz.sha256
       - name: Publish draft distribution to GitHub (for tags only)
         if: startsWith(github.ref, 'refs/tags/')
-        uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
+        uses: softprops/action-gh-release@e7a8f85e1c67a31e6ed99a94b41bd0b71bbee6b8 # v2.0.9
         with:
           name: GRASS GIS ${{ github.ref_name }}
           body: |

diff --git a/.github/workflows/docker.yml b/.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

diff --git a/.github/workflows/gcc.yml b/.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

diff --git a/.github/workflows/macos.yml b/.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

diff --git a/.github/workflows/macos_dependencies.txt b/.github/workflows/macos_dependencies.txt
@@ -2,6 +2,7 @@ cairo
 clangxx_osx-arm64
 clang_osx-arm64
 cmake
+expat
 fftw
 flex
 freetype
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ cairo @@
     clangxx_osx-arm64
     clang_osx-arm64
     cmake
+    expat
     fftw
     flex
     freetype
@@ Expand Down @@