From dd8443dad7d2bb00008dd0933ba92d96e8c776f4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 10:16:17 -0400 Subject: [PATCH 01/10] CI(deps): Update dependency pystac to v1.11.0 (#1217) --- src/temporal/t.stac/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/temporal/t.stac/requirements.txt b/src/temporal/t.stac/requirements.txt index 09e1cde407..425bdebebd 100644 --- a/src/temporal/t.stac/requirements.txt +++ b/src/temporal/t.stac/requirements.txt @@ -1,3 +1,3 @@ -pystac==1.10.1 +pystac==1.11.0 pystac_client==0.8.3 tqdm==4.66.5 From e9583de3f0fc8e4e801900316ce8af77a8abb2e3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2024 18:23:10 -0400 Subject: [PATCH 02/10] CI(deps): Update pre-commit hook pre-commit/pre-commit-hooks to v5 (#1218) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ca7692a6a2..654600c509 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,7 @@ --- repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 + rev: v5.0.0 hooks: - id: trailing-whitespace exclude: | From 3a68ab790299fce9fe399b66043e4ba58148323a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 18:14:56 -0400 Subject: [PATCH 03/10] CI(deps): Update actions/checkout action to v4.2.1 (#1220) --- .github/workflows/additional_checks.yml | 2 +- .github/workflows/black.yml | 2 +- .github/workflows/ci.yml | 4 ++-- .github/workflows/clang-format-check.yml | 2 +- .github/workflows/flake8.yml | 2 +- .github/workflows/super-linter.yml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/additional_checks.yml b/.github/workflows/additional_checks.yml index 1592225f2d..3c4fb2d649 100644 --- a/.github/workflows/additional_checks.yml +++ b/.github/workflows/additional_checks.yml @@ -26,7 +26,7 @@ jobs: steps: - name: Checkout repository contents - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: fetch-depth: 31 diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml index 5c13ebf991..e070e2305d 100644 --- a/.github/workflows/black.yml +++ b/.github/workflows/black.yml @@ -30,7 +30,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: persist-credentials: false - name: Set up Python diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a946abae87..6faa38e4d6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,14 +38,14 @@ jobs: steps: - name: Checkout core - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: repository: OSGeo/grass ref: ${{ matrix.grass-version }} path: grass - name: Checkout addons - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: path: grass-addons diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml index 5cb5c915f1..b991cde77d 100644 --- a/.github/workflows/clang-format-check.yml +++ b/.github/workflows/clang-format-check.yml @@ -15,7 +15,7 @@ jobs: name: Formatting Check runs-on: ubuntu-latest steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: persist-credentials: false - uses: DoozyX/clang-format-lint-action@c71d0bf4e21876ebec3e5647491186f8797fde31 # v0.18.2 diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index a2621517d6..e016bc1edc 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -26,7 +26,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 - name: Set up Python uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0 diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml index cb283e6f1f..42267522e0 100644 --- a/.github/workflows/super-linter.yml +++ b/.github/workflows/super-linter.yml @@ -26,7 +26,7 @@ jobs: # To report GitHub Actions status checks statuses: write steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: # super-linter needs the full git history to get the # list of files that changed across commits From f2ea77825882ce00aa0a744c0484d1968a6c6fe5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 18:15:21 -0400 Subject: [PATCH 04/10] CI(deps): Update black to v24.10.0 (#1221) --- .github/workflows/black.yml | 2 +- .pre-commit-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml index e070e2305d..2d729716b8 100644 --- a/.github/workflows/black.yml +++ b/.github/workflows/black.yml @@ -15,7 +15,7 @@ env: # renovate: datasource=python-version depName=python PYTHON_VERSION: "3.12" # renovate: datasource=pypi depName=black - BLACK_VERSION: "24.8.0" + BLACK_VERSION: "24.10.0" permissions: {} jobs: run-black: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 654600c509..a170f94306 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -29,7 +29,7 @@ repos: - id: markdownlint-fix # Using this mirror lets us use mypyc-compiled black, which is about 2x faster - repo: https://github.com/psf/black-pre-commit-mirror - rev: 24.8.0 + rev: 24.10.0 hooks: - id: black-jupyter - repo: https://github.com/pycqa/flake8 From ad552cb81e80abe2a78b2953d0b54c1f73c9ee25 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 18:15:31 -0400 Subject: [PATCH 05/10] CI(deps): Update actions/upload-artifact action to v4.4.1 (#1219) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6faa38e4d6..e1d26dff8a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -121,7 +121,7 @@ jobs: ../.github/workflows/test.sh - name: Make HTML test report available - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0 + uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4.4.1 with: name: testreport-grass-${{ matrix.grass-version }}-python-${{ matrix.python-version }} path: grass-addons/src/testreport From 615500ab3e739f27745b25e2c7a681bc4ff1fa9f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 08:50:52 -0400 Subject: [PATCH 06/10] CI(deps): Update actions/upload-artifact action to v4.4.2 (#1223) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e1d26dff8a..b181a6fe00 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -121,7 +121,7 @@ jobs: ../.github/workflows/test.sh - name: Make HTML test report available - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4.4.1 + uses: actions/upload-artifact@84480863f228bb9747b473957fcc9e309aa96097 # v4.4.2 with: name: testreport-grass-${{ matrix.grass-version }}-python-${{ matrix.python-version }} path: grass-addons/src/testreport From 3f8250a1308353c641a759be763755a9dcdd1df9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2024 14:08:31 -0400 Subject: [PATCH 07/10] CI(deps): Update actions/upload-artifact action to v4.4.3 (#1224) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b181a6fe00..18a55703aa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -121,7 +121,7 @@ jobs: ../.github/workflows/test.sh - name: Make HTML test report available - uses: actions/upload-artifact@84480863f228bb9747b473957fcc9e309aa96097 # v4.4.2 + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 with: name: testreport-grass-${{ matrix.grass-version }}-python-${{ matrix.python-version }} path: grass-addons/src/testreport From 261b8fa424db397d138705b6ae6ab8a016cded69 Mon Sep 17 00:00:00 2001 From: Stefan Blumentrath Date: Wed, 16 Oct 2024 13:27:01 +0200 Subject: [PATCH 08/10] silence GDAL warning and fix GDAL-GRASS driver (#1216) --- src/raster/r.buildvrt.gdal/r.buildvrt.gdal.py | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/raster/r.buildvrt.gdal/r.buildvrt.gdal.py b/src/raster/r.buildvrt.gdal/r.buildvrt.gdal.py index a9ab63c0b5..5e9363fb40 100644 --- a/src/raster/r.buildvrt.gdal/r.buildvrt.gdal.py +++ b/src/raster/r.buildvrt.gdal/r.buildvrt.gdal.py @@ -75,7 +75,7 @@ def get_raster_gdalpath( - map_name, check_linked=True, has_grasadriver=False, gis_env=None + map_name, check_linked=True, has_grassdriver=False, gis_env=None ): """Get the GDAL-readable path to a GRASS GIS raster map @@ -102,7 +102,7 @@ def get_raster_gdalpath( return str(gdal_path) # Get native GRASS GIS format header - if not has_grasadriver: + if not has_grassdriver: gs.fatal( _( "The GDAL-GRASS GIS driver is unavailable. " @@ -127,6 +127,8 @@ def main(): global gdal try: from osgeo import gdal + + gdal.UseExceptions() except ImportError: gs.fatal( _( @@ -153,7 +155,10 @@ def main(): if len(inputs) < 1: gs.fatal(_("At least one input map is required".format(inputs[0]))) - inputs = [get_raster_gdalpath(raster_map, gis_env=gisenv) for raster_map in inputs] + inputs = [ + get_raster_gdalpath(raster_map, has_grassdriver=has_grassdriver, gis_env=gisenv) + for raster_map in inputs + ] # Get output output = options["output"] @@ -170,7 +175,14 @@ def main(): # Create GDAL VRT vrt_path = str(vrt_dir / f"{output}.vrt") gs.verbose(_("Creating GDAL VRT '{}'.").format(vrt_path)) - gdal.BuildVRT(vrt_path, inputs) + try: + gdal.BuildVRT(vrt_path, inputs) + except OSError: + gs.fatal( + _("Failed to build VRT {vrt} with inputs <{in_files}>").format( + vrt=vrt_path, in_file=", ".join(inputs) + ) + ) # Import (link) GDAL VRT gs.run_command( From 147ebe7d1a065698486dbb05796a1c9ed42f72e1 Mon Sep 17 00:00:00 2001 From: Stefan Blumentrath Date: Wed, 16 Oct 2024 23:18:45 +0200 Subject: [PATCH 09/10] i.eodag: Support AOIs from other mapsets (#1225) --- src/imagery/i.eodag/i.eodag.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/imagery/i.eodag/i.eodag.py b/src/imagery/i.eodag/i.eodag.py index 4234fd42ec..a78afd7999 100755 --- a/src/imagery/i.eodag/i.eodag.py +++ b/src/imagery/i.eodag/i.eodag.py @@ -337,7 +337,7 @@ def get_aoi(vector=None): if "+proj" not in proj: gs.fatal(_("Unable to get AOI: unprojected location not supported")) - if vector not in gs.parse_command("g.list", type="vector"): + if not gs.find_file(vector, element="vector")["file"]: gs.fatal( _("Unable to get AOI: vector map <{}> could not be found".format(vector)) ) From b24bf40b5320c210979d586c363b8d3b03e463db Mon Sep 17 00:00:00 2001 From: Tomas Zigo <50632337+tmszi@users.noreply.github.com> Date: Fri, 18 Oct 2024 12:52:32 +0200 Subject: [PATCH 10/10] v.kriging: fix compilation warnings (#934) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * v.kriging: fix compilation warnings - passing argument 3 of ‘submatrix’ from incompatible pointer type - expected ‘struct write *’ but argument is of type ‘struct write ** - initialization of ‘double *’ from incompatible pointer type ‘int * - initialization of ‘struct write *’ from incompatible pointer type ‘struct write ** * Fix Clang format error --------- Co-authored-by: Edouard Choinière <27212526+echoix@users.noreply.github.com> --- src/vector/v.kriging/utils_kriging.c | 8 ++++---- src/vector/v.kriging/utils_raster.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/vector/v.kriging/utils_kriging.c b/src/vector/v.kriging/utils_kriging.c index 4e67d9562e..5b7df3a249 100644 --- a/src/vector/v.kriging/utils_kriging.c +++ b/src/vector/v.kriging/utils_kriging.c @@ -713,7 +713,7 @@ void crossvalidation(struct int_par *xD, struct points *pnts, correct_indices(direction, list, r, pnts, var_par); GM_sub = submatrix(list, GM, - &xD->report); // create submatrix using indices + xD->report); // create submatrix using indices GM_Inv = G_matrix_inverse(GM_sub); // inverse matrix G_matrix_free(GM_sub); @@ -834,8 +834,8 @@ int compare_NN(struct ilist *list, struct ilist *list_new, int modified) { // local variables int n = list->n_values, n_new = list_new->n_values; - double *list_value = list->value; - double *list_new_value = list_new->value; + int *list_value = list->value; + int *list_new_value = list_new->value; int i, next = 0; // the samples are different @@ -859,7 +859,7 @@ void make_subsamples(struct int_par *xD, struct ilist *list, double *r0, // Local variables int i3 = xD->i3; double *vals = pnts->invals; - struct write *report = &xD->report; + struct write *report = xD->report; int direction; mat_struct *GM_sub; diff --git a/src/vector/v.kriging/utils_raster.c b/src/vector/v.kriging/utils_raster.c index 697cd6e844..4249a569d2 100644 --- a/src/vector/v.kriging/utils_raster.c +++ b/src/vector/v.kriging/utils_raster.c @@ -3,7 +3,7 @@ /* open raster layer */ void open_layer(struct int_par *xD, struct reg_par *reg, struct output *out) { - struct write *report = &xD->report; + struct write *report = xD->report; /* 2D Raster layer */ if (xD->i3 == FALSE) { @@ -34,7 +34,7 @@ void write2layer(struct int_par *xD, struct reg_par *reg, struct output *out, // Local variables int i3 = xD->i3; int ndeps = reg->ndeps, nrows = reg->nrows, ncols = reg->ncols; - struct write *report = &xD->report; + struct write *report = xD->report; int col, row, dep; int pass = 0; /* Number of processed cells */