Skip to content

Commit

Permalink
Merge branch 'main' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
lbartoletti authored Jan 19, 2024
2 parents ffad0a0 + b0deb48 commit 2bf022b
Show file tree
Hide file tree
Showing 551 changed files with 29,400 additions and 10,652 deletions.
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ docker
.github
.travis
.travis.yml
# Do not copy files from previous compilations
dist.*

# The following git files are needed by GRASS GIS to extract the revision
# during compilation. If you are not using one of the Dockerimages from this
Expand Down
1 change: 1 addition & 0 deletions .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ per-file-ignores =
gui/wxpython/core/giface.py: E501
gui/wxpython/core/gthread.py: F841
gui/wxpython/core/gconsole.py: E722, W605
gui/wxpython/core/globalvar.py: W605
gui/wxpython/core/toolboxes.py: E722, E501
gui/wxpython/core/utils.py: E722, F841, W605
gui/wxpython/core/workspace.py: E722, E501
Expand Down
160 changes: 160 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
---
libraries:
- changed-files:
- any-glob-to-any-file:
- lib/**
- include/grass/**
- python/**
module:
- changed-files:
- any-glob-to-any-file:
- db/**
- display/**
- general/**
- imagery/**
- misc/**
- ps/**
- raster/**
- raster3d/**
- scripts/**
- temporal/**
- vector/**

# Module categories
database:
- changed-files:
- any-glob-to-any-file:
- db/**
- lib/db/**
- scripts/db.*/**
- '**.sql'
display:
- changed-files:
- any-glob-to-any-file:
- display/**
- lib/display/**
- scripts/d.*/**
general:
- changed-files:
- any-glob-to-any-file:
- general/**
- scripts/g.*/**
GUI:
- changed-files:
- any-glob-to-any-file:
- gui/**
imagery:
- changed-files:
- any-glob-to-any-file:
- imagery/**
- lib/imagery/**
- scripts/i.*/**
misc:
- changed-files:
- any-glob-to-any-file:
- misc/**
- scripts/m.*/**
raster:
- changed-files:
- any-glob-to-any-file:
- raster/**
- lib/raster/**
- scripts/r.*/**
raster3d:
- changed-files:
- any-glob-to-any-file:
- raster3d/**
- lib/raster3d/**
- scripts/r3.*/**
temporal:
- changed-files:
- any-glob-to-any-file:
- temporal/**
- lib/temporal/**
- scripts/t.*/**
vector:
- changed-files:
- any-glob-to-any-file:
- vector/**
- lib/vector/**
- scripts/v.*/**

# Build, packaging, or OS related
CI:
- changed-files:
- any-glob-to-any-file:
- .github/**
- .travis/**
- binder/**
- .travis.yml
- renovate.json
- .pre-commit-config.yaml
Windows:
- changed-files:
- any-glob-to-any-file:
- mswindows/**
macOS:
- changed-files:
- any-glob-to-any-file:
- macosx/**
Linux:
- changed-files:
- any-glob-to-any-file:
- singularity/**
- rpm/**
docker:
- changed-files:
- any-glob-to-any-file:
- docker/**
- '**/*Dockerfile*'
- '**/*dockerfile*'
- .dockerignore

docs:
- all:
- changed-files:
- any-glob-to-any-file:
- doc/**
- man/**
- '**/*.md'
- '**/*.rst'
- '**/*.html'
- '**/*.dox'
- '**/*.png'
- '**.cff'
- CITING
- CHANGES
- AUTHORS
- NEWS
- TODO
- all-globs-to-all-files:
- '!doc/development/rfc/**'
RFC:
- changed-files:
- any-glob-to-any-file:
- doc/development/rfc/**
translation:
- changed-files:
- any-glob-to-any-file: locale/**

# based on file types
Python:
- changed-files:
- any-glob-to-any-file:
- '**/*.py'
- '**/pyproject.toml'
C:
- changed-files:
- any-glob-to-any-file: '**/*.c'
C++:
- changed-files:
- any-glob-to-any-file: '**/*.cpp'
CSS:
- changed-files:
- any-glob-to-any-file: '**/*.css'
HTML:
- changed-files:
- any-glob-to-any-file: '**/*.html'
JavaScript:
- changed-files:
- any-glob-to-any-file: '**/*.js'
4 changes: 2 additions & 2 deletions .github/workflows/additional_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

steps:
- name: Checkout repository contents
uses: actions/checkout@v3
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
with:
fetch-depth: 31

Expand All @@ -38,7 +38,7 @@ jobs:
exclude: mswindows .*\.bat .*/testsuite/data/.*

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/apt.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ python3-numpy
python3-pil
python3-ply
python3-pyvirtualdisplay
python3-six
python3-termcolor
sqlite3
zlib1g-dev
48 changes: 0 additions & 48 deletions .github/workflows/build_centos.sh

This file was deleted.

5 changes: 3 additions & 2 deletions .github/workflows/build_ubuntu-22.04.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ fi
# an old version of configure, which issues compiler warnings and
# errors out. This may be removed with upgraded configure.in file.
makecmd="make"
if [[ "$#" -eq 2 ]]; then
makecmd="make CFLAGS='$CFLAGS $2' CXXFLAGS='$CXXFLAGS $2'"
if [[ "$#" -ge 2 ]]; then
ARGS=("$@")
makecmd="make CFLAGS='$CFLAGS ${ARGS[@]:1}' CXXFLAGS='$CXXFLAGS ${ARGS[@]:1}'"
fi

# non-existent variables as an errors
Expand Down
74 changes: 0 additions & 74 deletions .github/workflows/centos.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/clang-format-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
name: Formatting Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- name: Run clang-format style check for C/C++/Protobuf programs.
uses: jidicula/clang-format-action@v4.11.0
with:
Expand Down
Loading

0 comments on commit 2bf022b

Please sign in to comment.