[GRASS-git] [OSGeo/grass] 6f0ecc: CI: Switch Travis to Ubuntu 22.04 and fix non-prot...

Edouard Choinière noreply at github.com
Fri Jun 21 16:08:53 PDT 2024 

  Branch: refs/heads/renovate/pylint-2.x
  Home:   https://github.com/OSGeo/grass
  Commit: 6f0eccbe34e5e0f26785f3badfb0f1d46443dddb
      https://github.com/OSGeo/grass/commit/6f0eccbe34e5e0f26785f3badfb0f1d46443dddb
  Author: Vaclav Petras <wenzeslaus at gmail.com>
  Date:   2024-06-19 (Wed, 19 Jun 2024)

  Changed paths:
    M .travis.yml
    M .travis/linux.before_install.sh
    M .travis/linux.install.sh
    M .travis/linux.script.sh
    M db/drivers/odbc/describe.c
    M db/drivers/odbc/fetch.c
    M db/drivers/odbc/listtab.c

  Log Message:
  -----------
  CI: Switch Travis to Ubuntu 22.04 and fix non-prototype in ODBC (#3002)

* CI: Switch Travis to Ubuntu 22.04 (jammmy)

Default Python version reported by Travis for 20.04 is 3.7.13. While that's still a supported version for 8.3 release if it would be released now, 2023-06-27 is end of support for 3.7, so it seems safe to not test the main branch with 3.7 at this point.

Ubuntu 22.04 in Travis uses Python 3.10 by default according to the documentation.

* Update wxgtk pkg to 4.0

* Replace custom install list by apt.txt file from GitHub Actions

* Change shebang to use bash instead of POSIX sh (#3)

* CI(travis): Add --with-pdal in linux.script.sh

* CI(travis): Remove sudo: required as it has no effect

* CI(travis): Fix warning os and dist missing from root

* CI(travis): Fix warning matrix is an alias for jobs

* CI(travis): Run make with make -j $(nproc)

* CI(travis): Show MAKEFLAGS at start of script

* CI(travis): use c++17 standard

* CI(travis): Remove duplicated dist key in include array

* CI(travis): Remove invalid --with-python from configure flags

* CI(travis): Remove unused codecov upload

* CI(travis): Remove irc notification

* CI(travis): Add -Werror and -fPIC to CFLAGS and CXXFLAGS on make call

* CI(travis): Limit runs on branches to main and release branches

* CI(travis): Add -Wfatal-errors

* db: Fix -Wdeprecated-non-prototype in describe.c for clang builds

* CI(travis): Add --no-keep-going in MAKEFLAGS to stop on errors

* db: Fix -Wdeprecated-non-prototype in odbc driver's fetch.c for clang builds

* db: Fix -Wdeprecated-non-prototype in odbc driver's listtab.c for clang builds

---------

Co-authored-by: Edouard Choinière <27212526+echoix at users.noreply.github.com>


  Commit: 9564852ce5274e529006579e5d926387ff639f9b
      https://github.com/OSGeo/grass/commit/9564852ce5274e529006579e5d926387ff639f9b
  Author: Vaclav Petras <wenzeslaus at gmail.com>
  Date:   2024-06-19 (Wed, 19 Jun 2024)

  Changed paths:
    M python/grass/experimental/tests/conftest.py
    M python/grass/experimental/tests/grass_script_mapset_session_test.py
    M python/grass/script/setup.py
    M python/grass/script/tests/grass_script_core_location_test.py
    M python/grass/script/tests/grass_script_setup_test.py
    M scripts/v.db.univar/tests/conftest.py
    M scripts/v.db.univar/tests/v_db_univar_test.py
    M scripts/v.dissolve/tests/conftest.py
    M scripts/v.dissolve/tests/v_dissolve_aggregate_test.py
    M scripts/v.dissolve/tests/v_dissolve_geometry_test.py
    M scripts/v.dissolve/tests/v_dissolve_layers_test.py
    M scripts/v.dissolve/tests/v_dissolve_test.py
    M temporal/t.rast.list/tests/conftest.py
    M temporal/t.rast.list/tests/t_rast_list_test.py
    M vector/v.fill.holes/tests/conftest.py
    M vector/v.fill.holes/tests/v_fill_holes_test.py

  Log Message:
  -----------
  grass.script: Allow init to modify only specified environment (#3438)

The _grass.script.setup.init_ function modifies os.environ. While os.environ is fit for many, if not most, cases, usage in tests and parallel processing is limited and in all cases, os.environ stays partially modified even after session is finished (we don't destroy the runtime environment, i.e., variables such as GISBASE). With this change, _init_ takes _env_ parameter specifying the environment to modify and it modifies that environment. When no _env_ is provided, it still modifies os.environ, so the default behavior is not changed.

This required only few changes to the initialization code, but more changes were needed for the cleanup code. A lot of tests can now take advantage of this functionality and this PR updates some of them. I plan to update all where it is applicable, but will leave as is some others, namely those which use ctypes (situation is more complex there) and _grass.jupyter_ (_env_ parameter is not implemented for most of them).

There is plenty of tests covering it, but the cleanup part which needed most changes does not have any coverage. I don't think there is much concern in terms of API because _env_ parameters is what we now have in many functions. The only uncertainty with that is whether it should create its own copy or modify the provided environment. I go with modify because that makes the copy explicit in the call which is more clear (caller or reader is sure a copy is created) and it is consistent with how os.environ is modified.


  Commit: afd76107b0235d29c6eb7cff7b78f456922dc32b
      https://github.com/OSGeo/grass/commit/afd76107b0235d29c6eb7cff7b78f456922dc32b
  Author: Edouard Choinière <27212526+echoix at users.noreply.github.com>
  Date:   2024-06-19 (Wed, 19 Jun 2024)

  Changed paths:
    M .github/workflows/pytest.yml
    M pyproject.toml
    M python/grass/pygrass/modules/tests/grass_pygrass_grid_test.py

  Log Message:
  -----------
  CI(pytest): Run tests marked need_solo_run separately (#3879)

* pytest: Create slow and needs_solo_run markers

* python: Apply needs_solo_run marker to two pygrass grid tests

* CI(pytest): Run tests marked need_solo_run separately with a single runner

* pytest: Revert timeout to 300 seconds


  Commit: 7673b8099049ca5fdceee13c4fb17ea1795c5951
      https://github.com/OSGeo/grass/commit/7673b8099049ca5fdceee13c4fb17ea1795c5951
  Author: Ondrej Pesek <pesej.ondrek at gmail.com>
  Date:   2024-06-19 (Wed, 19 Jun 2024)

  Changed paths:
    M gui/wxpython/gmodeler/dialogs.py

  Log Message:
  -----------
  wxGUI/gmodeler: fix conflicting flags in 'Create relation' dialog (#3865)

* wxGUI/gmodeler: fix conflicting flags in 'Create relation' dialog
* meanwhile, fix the button size to see them in the default pop-up
* fix #3862


  Commit: 982b9b1339b0e2c11baf0f9ef79b373a3ee29c89
      https://github.com/OSGeo/grass/commit/982b9b1339b0e2c11baf0f9ef79b373a3ee29c89
  Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
  Date:   2024-06-19 (Wed, 19 Jun 2024)

  Changed paths:
    M .github/workflows/periodic_update.yml

  Log Message:
  -----------
  CI(deps): Update peter-evans/create-pull-request action to v6.1.0 (#3895)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


  Commit: 55b14b176b94d9d5422dffd17b1d06b21d721fca
      https://github.com/OSGeo/grass/commit/55b14b176b94d9d5422dffd17b1d06b21d721fca
  Author: Ondrej Pesek <pesej.ondrek at gmail.com>
  Date:   2024-06-19 (Wed, 19 Jun 2024)

  Changed paths:
    M gui/wxpython/gmodeler/panels.py

  Log Message:
  -----------
  wxGUI/gmodeler: fix adding data from menu (#3881)

* fix #3863


  Commit: 318251dae4c086b7de987fabf1c894a0523fa707
      https://github.com/OSGeo/grass/commit/318251dae4c086b7de987fabf1c894a0523fa707
  Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
  Date:   2024-06-19 (Wed, 19 Jun 2024)

  Changed paths:
    M .github/workflows/docker.yml

  Log Message:
  -----------
  CI(deps): Update docker/build-push-action action to v6 (#3897)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


  Commit: 5be030ebe925bcb0c9c5a9d3f0a4a1c816ec6690
      https://github.com/OSGeo/grass/commit/5be030ebe925bcb0c9c5a9d3f0a4a1c816ec6690
  Author: Caitlin Haedrich <69856275+chaedri at users.noreply.github.com>
  Date:   2024-06-19 (Wed, 19 Jun 2024)

  Changed paths:
    M doc/notebooks/jupyter_example.ipynb
    M doc/notebooks/jupyter_tutorial.ipynb
    M python/grass/jupyter/interactivemap.py

  Log Message:
  -----------
  grass.jupyter: Add LayerControl to InteractiveMap by default (#3880)


  Commit: da134529232a2784706d455cbb5b773deb1bd493
      https://github.com/OSGeo/grass/commit/da134529232a2784706d455cbb5b773deb1bd493
  Author: Māris Nartišs <maris.gis at gmail.com>
  Date:   2024-06-20 (Thu, 20 Jun 2024)

  Changed paths:
    M raster/r.in.pdal/info.cpp

  Log Message:
  -----------
  r.in.pdal: use 1 based return numbers in LAS info output (#3907)

According to LAS specification, the first return number is 1.
Fixes #3827


  Commit: 69787034b09576d8315adb534e05225147e0c0ac
      https://github.com/OSGeo/grass/commit/69787034b09576d8315adb534e05225147e0c0ac
  Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
  Date:   2024-06-20 (Thu, 20 Jun 2024)

  Changed paths:
    M .github/workflows/create_release_draft.yml

  Log Message:
  -----------
  CI(deps): Update softprops/action-gh-release action to v2.0.6 (#3908)


  Commit: 362ad48e7d27af1a475b13c22da31d9b302a2ee2
      https://github.com/OSGeo/grass/commit/362ad48e7d27af1a475b13c22da31d9b302a2ee2
  Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
  Date:   2024-06-20 (Thu, 20 Jun 2024)

  Changed paths:
    M Dockerfile
    M docker/ubuntu/Dockerfile

  Log Message:
  -----------
  CI(deps): Update docker/dockerfile:1.8 Docker digest to e87caa7 (#3894)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


  Commit: 30751a026e99f0c9f5ca913d43c761d057a68b03
      https://github.com/OSGeo/grass/commit/30751a026e99f0c9f5ca913d43c761d057a68b03
  Author: Anna Petrasova <kratochanna at gmail.com>
  Date:   2024-06-20 (Thu, 20 Jun 2024)

  Changed paths:
    M CONTRIBUTING.md
    A doc/development/github_guide.md

  Log Message:
  -----------
  contributing: move GitHub workflow docs into separate file (#3875)


  Commit: beda5b3d8db782ce412bb3ac30a72353f7d87836
      https://github.com/OSGeo/grass/commit/beda5b3d8db782ce412bb3ac30a72353f7d87836
  Author: Ivan Mincik <ivan.mincik at gmail.com>
  Date:   2024-06-20 (Thu, 20 Jun 2024)

  Changed paths:
    M .gitignore
    A flake.lock
    A flake.nix
    A package.nix

  Log Message:
  -----------
  packaging: Add Nix files for creating development environment and the package (#3889)


  Commit: 7ad3e34c069bb2387451ed3d0ab4a17f01a776be
      https://github.com/OSGeo/grass/commit/7ad3e34c069bb2387451ed3d0ab4a17f01a776be
  Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
  Date:   2024-06-21 (Fri, 21 Jun 2024)

  Changed paths:
    M .github/workflows/docker.yml

  Log Message:
  -----------
  CI(deps): Update docker/build-push-action action to v6.1.0 (#3913)


  Commit: 004b916c4f66a12b5e2b713f4925570666fb73e2
      https://github.com/OSGeo/grass/commit/004b916c4f66a12b5e2b713f4925570666fb73e2
  Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
  Date:   2024-06-21 (Fri, 21 Jun 2024)

  Changed paths:
    M docker/alpine/Dockerfile

  Log Message:
  -----------
  CI(deps): Update alpine:3.20 Docker digest to b89d9c9 (#3914)


  Commit: e18a39994cbab1940755855a16b0bf7cfaa731e4
      https://github.com/OSGeo/grass/commit/e18a39994cbab1940755855a16b0bf7cfaa731e4
  Author: Ondrej Pesek <pesej.ondrek at gmail.com>
  Date:   2024-06-21 (Fri, 21 Jun 2024)

  Changed paths:
    R doc/help_loc_structure.odg
    A doc/help_project_structure.odg
    M grasslib.dox
    M lib/init/Makefile
    R lib/init/help_loc_struct.png
    A lib/init/help_project_structure.png
    R lib/loc_struct.png

  Log Message:
  -----------
  doc: help_loc_structure -> help_project_structure (#3910)

* location is renamed to project in 8.4


  Commit: 1efff48a456acbb068cb5e31ea0e0f93cf0d03ac
      https://github.com/OSGeo/grass/commit/1efff48a456acbb068cb5e31ea0e0f93cf0d03ac
  Author: Ondrej Pesek <pesej.ondrek at gmail.com>
  Date:   2024-06-22 (Sat, 22 Jun 2024)

  Changed paths:
    M vector/v.external/args.c

  Log Message:
  -----------
  v.external: delete duplicated layer requirement definition (#3902)


  Commit: 2197bce6115f402f1dbb18bcc0aa7ba43cc82de1
      https://github.com/OSGeo/grass/commit/2197bce6115f402f1dbb18bcc0aa7ba43cc82de1
  Author: Edouard Choinière <27212526+echoix at users.noreply.github.com>
  Date:   2024-06-22 (Sat, 22 Jun 2024)

  Changed paths:
    M .github/workflows/create_release_draft.yml
    M .github/workflows/docker.yml
    M .github/workflows/periodic_update.yml
    M .github/workflows/pytest.yml
    M .gitignore
    M .travis.yml
    M .travis/linux.before_install.sh
    M .travis/linux.install.sh
    M .travis/linux.script.sh
    M CONTRIBUTING.md
    M Dockerfile
    M db/drivers/odbc/describe.c
    M db/drivers/odbc/fetch.c
    M db/drivers/odbc/listtab.c
    A doc/development/github_guide.md
    R doc/help_loc_structure.odg
    A doc/help_project_structure.odg
    M doc/notebooks/jupyter_example.ipynb
    M doc/notebooks/jupyter_tutorial.ipynb
    M docker/alpine/Dockerfile
    M docker/ubuntu/Dockerfile
    A flake.lock
    A flake.nix
    M grasslib.dox
    M gui/wxpython/gmodeler/dialogs.py
    M gui/wxpython/gmodeler/panels.py
    M lib/init/Makefile
    R lib/init/help_loc_struct.png
    A lib/init/help_project_structure.png
    R lib/loc_struct.png
    A package.nix
    M pyproject.toml
    M python/grass/experimental/tests/conftest.py
    M python/grass/experimental/tests/grass_script_mapset_session_test.py
    M python/grass/jupyter/interactivemap.py
    M python/grass/pygrass/modules/tests/grass_pygrass_grid_test.py
    M python/grass/script/setup.py
    M python/grass/script/tests/grass_script_core_location_test.py
    M python/grass/script/tests/grass_script_setup_test.py
    M raster/r.in.pdal/info.cpp
    M scripts/v.db.univar/tests/conftest.py
    M scripts/v.db.univar/tests/v_db_univar_test.py
    M scripts/v.dissolve/tests/conftest.py
    M scripts/v.dissolve/tests/v_dissolve_aggregate_test.py
    M scripts/v.dissolve/tests/v_dissolve_geometry_test.py
    M scripts/v.dissolve/tests/v_dissolve_layers_test.py
    M scripts/v.dissolve/tests/v_dissolve_test.py
    M temporal/t.rast.list/tests/conftest.py
    M temporal/t.rast.list/tests/t_rast_list_test.py
    M vector/v.external/args.c
    M vector/v.fill.holes/tests/conftest.py
    M vector/v.fill.holes/tests/v_fill_holes_test.py

  Log Message:
  -----------
  Merge branch 'main' into renovate/pylint-2.x


Compare: https://github.com/OSGeo/grass/compare/aa4380b8c340...2197bce6115f

To unsubscribe from these emails, change your notification settings at https://github.com/OSGeo/grass/settings/notifications

More information about the grass-commit mailing list