Skip to content

Commit

Permalink
Merge branch 'grass8' into v-transects-line-cats
Browse files Browse the repository at this point in the history
  • Loading branch information
echoix authored Dec 22, 2023
2 parents 178b8d5 + 6d18278 commit 1ad2861
Show file tree
Hide file tree
Showing 1,462 changed files with 106,358 additions and 101,329 deletions.
30 changes: 30 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
BasedOnStyle: LLVM
IndentWidth: 4
---
Language: Cpp
AccessModifierOffset: -4
AlignConsecutiveMacros:
Enabled: true
AcrossEmptyLines: true
AcrossComments: true
PadOperators: true
AlignEscapedNewlines: Left
AllowShortFunctionsOnASingleLine: InlineOnly
AlwaysBreakTemplateDeclarations: Yes
BreakBeforeBraces: Stroustrup
ForEachMacros:
- DGL_FOREACH_NODE
- DGL_FOREACH_EDGE
- BOOST_FOREACH
IfMacros:
- SORT_DEBUG
MacroBlockBegin: GNO_BEGIN
MacroBlockEnd: GNO_END
SortIncludes: Never
---
Language: ObjC
---
Language: JavaScript
---
Language: Json
95 changes: 67 additions & 28 deletions .flake8
Original file line number Diff line number Diff line change
@@ -1,34 +1,52 @@
[flake8]
ignore =
E203, # whitespace before ':' (Black)
W503, # line break before binary operator (Black)
E265, # block comment should start with '# '
E266, # too many leading '#' for block comment
E402, # module level import not at top of file
E501, # line too long (161 > 150 characters)
E712, # comparison to False should be 'if cond is False:' or 'if not cond:'
E722, # do not use bare 'except'
E741, # ambiguous variable name 'l'
E999, # SyntaxError: invalid syntax
F401, # 'grass.script.core.gisenv' imported but unused
F402, # import 'ant' from line 15 shadowed by loop variable
F403, # 'from ... import *' used; unable to detect undefined names
F405, # '_' may be undefined, or defined from star imports: datetime
F507, # '...' % ... has 5 placeholder(s) but 7 substitution(s)
F509, # '...' % ... has unsupported format character '='
F521, # '...'.format(...) has invalid format string: Single '}' encountered in format string
F522, # '...'.format(...) has unused named argument(s): overwrite
F523, # '...'.format(...) has unused arguments at position(s): 0
F632, # use ==/!= to compare constant literals (str, bytes, int, float, tuple)
F811, # redefinition of unused 'GMessage' from line 35
F811, # redefinition of unused 'grass' from line 67
F811, # redefinition of unused 'test_getpenalty' from line 84
F811, # redefinition of unused 'transform' from line 153
F821, # undefined name '_'
F841, # local variable 'center' is assigned to but never used
W605, # invalid escape sequence '\_'

# whitespace before ':' (Black)
E203,
# line break before binary operator (Black)
W503,
# block comment should start with '# '
E265,
# too many leading '#' for block comment
E266,
# module level import not at top of file
E402,
# line too long (161 > 150 characters)
E501,
# comparison to False should be 'if cond is False:' or 'if not cond:'
E712,
# do not use bare 'except'
E722,
# ambiguous variable name 'l'
E741,
# 'grass.script.core.gisenv' imported but unused
F401,
# import 'ant' from line 15 shadowed by loop variable
F402,
# 'from ... import *' used; unable to detect undefined names
F403,
# '_' may be undefined, or defined from star imports: datetime
F405,
# '...' % ... has 5 placeholder(s) but 7 substitution(s)
F507,
# '...' % ... has unsupported format character '='
F509,
# '...'.format(...) has invalid format string: Single '}' encountered in format string
F521,
# '...'.format(...) has unused named argument(s): overwrite
F522,
# '...'.format(...) has unused arguments at position(s): 0
F523,
# use ==/!= to compare constant literals (str, bytes, int, float, tuple)
F632,
# redefinition of unused 'GMessage' from line 35
F811,
# undefined name '_'
F821,
# local variable 'center' is assigned to but never used
F841,

# W605 invalid escape sequence
# F823 local variable '_' defined as a builtin referenced before assignment
per-file-ignores =
src/display/d.frame/d.frame.py: E302
src/gui/wxpython/wx.wms/wmsmenu.py: W293
Expand All @@ -48,6 +66,18 @@ per-file-ignores =
src/imagery/i.nightlights.intercalibration/test_intercalibration_models.py: E302
src/imagery/i.landsat/i.landsat.download/i.landsat.download.py: E302
src/hadoop/hd/dependency.py: E211
src/raster/r.category.trim/r.category.trim.py: W605
src/raster/r.area.createweight/r.area.createweight.py: W605
src/raster/r.estimap.recreation/*/*.py: W605
src/raster/r.green/*/*.py: W605
src/raster/r.futures/r.futures.demand/r.futures.demand.py: W605
src/imagery/i.modis/libmodis/rmodislib.py: W605
src/imagery/i.landsat8.swlst/*.py: W605
src/hadoop/hd/*/*.py: W605
src/misc/m.printws/m.printws.py: W605
src/vector/v.class.mlpy/v.class.mlpy.py: W605
src/temporal/t.rast.boxplot/t.rast.boxplot.py: F823
src/raster/r.series.boxplot/r.series.boxplot.py: F823


max-line-length = 88
Expand All @@ -61,3 +91,12 @@ exclude =
ENV,
env.bak,
venv.bak,
# Build directories
bin.*,
dist.*,
OBJ.*,
# Test output directory
testreport,

builtins =
_
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
5fb6b1a969e72db28df78483d3360b15a17f0c68
cac8d9d848299297977d1315b7e90cc3f7698730
9 changes: 6 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ A clear and concise description of what the bug of the addon is.

**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Compute '....'
Expand All @@ -27,11 +28,13 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.

**System description (please complete the following information):**
- Operating System: [e.g. Windows, Linux, ... incl. version]
- GRASS GIS version [e.g. 7.8.1]

- Operating System: [e.g. Windows, Linux, ... incl. version]
- GRASS GIS version [e.g. 7.8.1]
<!---
- details about further software components
- run `g.version -rge` in a GRASS GIS terminal session or check in the GUI menu "Help > About"
- run `g.version -rge` in a GRASS GIS terminal session or check in the
GUI menu "Help > About"
--->

**Additional context**
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/black.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
---
name: Python Black Formatting

on:
push:
branches:
- grass*
- grass*
pull_request:

jobs:
Expand All @@ -15,17 +16,17 @@ jobs:
strategy:
matrix:
include:
- os: ubuntu-20.04
python-version: "3.10"
black-version: "22.3.0"
- os: ubuntu-22.04
python-version: '3.10'
black-version: 22.3.0

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build_grass.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export INSTALL_PREFIX=$1
--with-geos \
--with-sqlite \
--with-fftw \
--without-pdal \
--with-netcdf

make
Expand Down
Loading

0 comments on commit 1ad2861

Please sign in to comment.