Merge branch 'main' into fix_wxgui_single_win_mode_map_disp_full_screen

.github/FUNDING.yml

@@ -1 +1 @@
-custom: https://opencollective.com/grass
+open_collective: grass

.github/workflows/osgeo4w.yml

@@ -27,6 +27,12 @@ jobs:
           git config --global core.autocrlf false
           git config --global core.eol lf
       - uses: actions/checkout@v2
+      - uses: msys2/setup-msys2@v2
+        with:
+          path-type: inherit
+          location: D:\
+          update: true
+          install: tar libintl make bison flex diffutils git dos2unix zip mingw-w64-x86_64-toolchain mingw-w64-x86_64-fftw mingw-w64-x86_64-lapack mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-ccache mingw-w64-x86_64-zlib mingw-w64-x86_64-libiconv mingw-w64-x86_64-bzip2 mingw-w64-x86_64-gettext mingw-w64-x86_64-libsystre mingw-w64-x86_64-libtre-git mingw-w64-x86_64-libwinpthread-git mingw-w64-x86_64-libpng mingw-w64-x86_64-pcre mingw-w64-x86_64-python3-six
 
       - name: Install OSGeo4W
         run: |
@@ -35,17 +41,14 @@ jobs:
           (New-Object System.Net.WebClient).DownloadFile($url, $exe)
           Start-Process ('.\'+$exe) -ArgumentList '-A -g -k -q -s http://download.osgeo.org/osgeo4w/v2/ -P proj-devel,gdal-devel,geos-devel,libtiff-devel,libpng-devel,pdal-devel,netcdf-devel,cairo-devel,fftw,freetype-devel,gdal-ecw,gdal-mrsid,liblas-devel,libxdr,libpq-devel,pdcurses,python3-matplotlib,python3-numpy,python3-ply,python3-pywin32,python3-six,python3-wxpython,regex-devel,wxwidgets-devel,zstd-devel' -Wait
 
-      - name: Install MSYS2 packages
-        run: C:\msys64\usr\bin\pacman.exe --noconfirm -S tar libintl make bison flex diffutils git dos2unix zip mingw-w64-x86_64-toolchain mingw-w64-x86_64-cairo mingw-w64-x86_64-fftw mingw-w64-x86_64-lapack mingw-w64-x86_64-pkg-config mingw-w64-x86_64-gcc mingw-w64-x86_64-ccache mingw-w64-x86_64-zlib mingw-w64-x86_64-libiconv mingw-w64-x86_64-bzip2 mingw-w64-x86_64-gettext mingw-w64-x86_64-libsystre mingw-w64-x86_64-libtre-git mingw-w64-x86_64-libwinpthread-git mingw-w64-x86_64-libpng mingw-w64-x86_64-pcre mingw-w64-x86_64-python3-six
-
       - name: Compile GRASS GIS
-        run: C:\msys64\usr\bin\bash.exe -l (''+(Get-Location)+'\.github\workflows\build_osgeo4w.sh') (Get-Location)
+        run: D:\msys64\usr\bin\bash.exe -l (''+(Get-Location)+'\.github\workflows\build_osgeo4w.sh') (Get-Location)
 
       - name: Test executing of the grass command
         run: .github/workflows/test_simple.bat 'C:\OSGeo4W\opt\grass\grass83.bat'
 
       - name: Test executing of the grass command in bash
-        run: C:\msys64\usr\bin\bash.exe .github/workflows/test_simple.sh
+        run: D:\msys64\usr\bin\bash.exe .github/workflows/test_simple.sh
 
       - name: Run tests
         run: .github/workflows/test_thorough.bat 'C:\OSGeo4W\opt\grass\grass83.bat' 'C:\OSGeo4W\bin\python3'

.github/workflows/pytest.yml

@@ -43,7 +43,7 @@ jobs:
           python -m pip install --upgrade pip
           pip install -r .github/workflows/python_requirements.txt
           pip install -r .github/workflows/optional_requirements.txt
-          pip install pytest
+          pip install pytest pytest-timeout
 
       - name: Create installation directory
         run: |

.gitignore

@@ -29,8 +29,6 @@ raster/r.mapcalc/mapcalc.output
 raster/r.mapcalc/mapcalc.tab.c
 raster/r.mapcalc/mapcalc.tab.h
 raster/r.mapcalc/mapcalc.yy.c
-testreport/*
-testsuite/examples/testreports/
 mswindows/GRASS-Installer.nsi
 mswindows/GRASS-Packager.bat
 mswindows/osgeo4w/configure-stamp
@@ -40,7 +38,14 @@ mswindows/osgeo4w/package/
 mswindows/osgeo4w/setup*.hint
 mswindows/osgeo4w/vc/
 daag*.s
-doc/notebooks/.ipynb_checkpoints/
+
+# notebook helper files
+.ipynb_checkpoints
+
+# ignore gunittest helper and result files
+testreport/*
+testsuite/examples/testreports/
+test_keyvalue_result.txt
 
 # ignore paths generated by helper tools
 node_modules

README.md

@@ -6,6 +6,7 @@
 [![OSGeo4W](https://github.com/OSGeo/grass/workflows/OSGeo4W/badge.svg)](https://github.com/OSGeo/grass/actions?query=workflow%3AOSGeo4W)
 [![CentOS](https://github.com/OSGeo/grass/workflows/CentOS/badge.svg)](https://github.com/OSGeo/grass/actions?query=workflow%3ACentOS)
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.5176030.svg)](https://doi.org/10.5281/zenodo.5176030)
+[![Join the chat at https://gitter.im/grassgis/community](https://badges.gitter.im/grassgis/community.svg)](https://gitter.im/grassgis/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 # GRASS GIS Repository
 
@@ -20,7 +21,6 @@ Launch this repository in Binder and experiment with GRASS's Python API in Jupyt
 
 [![Binder](https://camo.githubusercontent.com/581c077bdbc6ca6899c86d0acc6145ae85e9d80e6f805a1071793dbe48917982/68747470733a2f2f6d7962696e6465722e6f72672f62616467655f6c6f676f2e737667)](https://mybinder.org/v2/gh/OSGeo/grass/main?urlpath=lab%2Ftree%2Fdoc%2Fnotebooks%2Fjupyter_example.ipynb)
 
-
 ## How to get write access here
 
 In general: you don't really need write access as you can simply open

db/db.columns/main.c

@@ -41,14 +41,14 @@ int main(int argc, char **argv)
     parse_command_line(argc, argv);
 
     if (!db_table_exists(parms.driver, parms.database, parms.table)) {
-	G_warning(_("Table <%s> not found in database <%s> using driver <%s>"),
-		   parms.table, parms.database, parms.driver);
-	exit(EXIT_FAILURE);
+        G_warning(_("Table <%s> not found in database <%s> using driver <%s>"),
+                  parms.table, parms.database, parms.driver);
+        exit(EXIT_FAILURE);
     }
 
     driver = db_start_driver(parms.driver);
     if (driver == NULL)
-	G_fatal_error(_("Unable to start driver <%s>"), parms.driver);
+        G_fatal_error(_("Unable to start driver <%s>"), parms.driver);
 
     db_init_handle(&handle);
     db_set_handle(&handle, parms.database, NULL);
@@ -59,15 +59,15 @@ int main(int argc, char **argv)
     db_init_string(&table_name);
     db_set_string(&table_name, parms.table);
     if (db_describe_table(driver, &table_name, &table) != DB_OK)
-	G_fatal_error(_("Unable to describe table <%s>"), parms.table);
+        G_fatal_error(_("Unable to describe table <%s>"), parms.table);
 
     db_close_database(driver);
     db_shutdown_driver(driver);
 
     ncols = db_get_table_number_of_columns(table);
     for (col = 0; col < ncols; col++)
-	fprintf(stdout, "%s\n",
-		db_get_column_name(db_get_table_column(table, col)));
+        fprintf(stdout, "%s\n",
+                db_get_column_name(db_get_table_column(table, col)));
 
     exit(EXIT_SUCCESS);
 }
@@ -88,11 +88,11 @@ static void parse_command_line(int argc, char **argv)
     driver = G_define_standard_option(G_OPT_DB_DRIVER);
     driver->options = db_list_drivers();
     if ((drv = db_get_default_driver_name()))
-	driver->answer = (char *) drv;
+        driver->answer = (char *)drv;
 
     database = G_define_standard_option(G_OPT_DB_DATABASE);
     if ((db = db_get_default_database_name()))
-	database->answer = (char *) db;
+        database->answer = (char *)db;
 
     /* Set description */
     module = G_define_module();
@@ -101,7 +101,7 @@ static void parse_command_line(int argc, char **argv)
     module->description = _("List all columns for a given table.");
 
     if (G_parser(argc, argv))
-	exit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
 
     parms.driver = driver->answer;
     parms.database = database->answer;