OSGeo · lucadelu · May 3, 2021 · May 3, 2021 · May 3, 2021 · May 6, 2021
diff --git a/.flake8 b/.flake8
@@ -0,0 +1,63 @@
+[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 '\_'
+
+
+per-file-ignores =
+    src/display/d.frame/d.frame.py: E302
+    src/gui/wxpython/wx.wms/wmsmenu.py: W293
+    src/gui/wxpython/wx.wms/WMSMapDisplay.py: W29
+    src/gui/wxpython/wx.wms/parse.py: E101, W191
+    src/raster/r.landscape.evol.old/r.landscape.evol.old.py: E302
+    src/raster/r.object.spatialautocor/r.object.spatialautocor.py: E302
+    src/raster/r.roughness.vector/r.roughness.vector.py: E302
+    src/raster/r.recode.attr/r.recode.attr.py: E302
+    src/raster/r.centroids/testsuite/test_r_centroids.py: E302
+    src/raster/r.euro.ecosystem/r.euro.ecosystem.py: W293
+    src/raster/r.soillossbare/r.soillossbare.py: E101, W191
+    src/raster/r.basin/r.basin.py: E302
+    src/raster/r.denoise/r.denoise.py: E302
+    src/imagery/i.landsat8.swlst/csv_to_dictionary.py: E302
+    src/imagery/i.nightlights.intercalibration/i.nightlights.intercalibration.py: E302
+    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
+
+
+max-line-length = 88
+exclude =
+    .git,
+    __pycache__,
+    .env,
+    .venv,
+    env,
+    venv,
+    ENV,
+    env.bak,
+    venv.bak,
diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml
@@ -0,0 +1,27 @@
+name: Python Black Formatting
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  run-black:
+    name: Check
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+
+      - name: Install
+        run: |
+          python -m pip install --upgrade pip
+          pip install black==21.5b1
+
+      - name: Run Black
+        run: |
+          black --check --diff .
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,11 +16,13 @@ jobs:
     strategy:
       matrix:
         grass-version:
-        - master
-        - releasebranch_7_8
+        - main
+        - releasebranch_8_0
         python-version:
-        - 3.6
-        - 3.8
+        # Test with supported Python versions.
+        # Test only with every second version to reduce number of jobs.
+        - "3.8"
+        - "3.10"
       fail-fast: false
 
     steps:
@@ -75,13 +77,13 @@ jobs:
       run: |
         echo "$HOME/install/bin" >> $GITHUB_PATH
 
-    - name: Make simple grass command available
+    - name: Make simple grass command available (not needed in G8)
       run: |
-        ln -s $HOME/install/bin/grass* $HOME/install/bin/grass
+        if [ ! -e $HOME/install/bin/grass ] ; then ln -s $HOME/install/bin/grass* $HOME/install/bin/grass ; fi
 
     - name: Build addons
       run: |
-        cd grass-addons/grass7
+        cd grass-addons/src
         GRASS_INSTALL=$HOME/install/grass*
         make MODULE_TOPDIR=$GRASS_INSTALL
 
@@ -101,12 +103,12 @@ jobs:
 
     - name: Run tests
       run: |
-        cd grass-addons/grass7
+        cd grass-addons/src
         ../.github/workflows/test.sh
 
     - name: Make HTML test report available
       uses: actions/upload-artifact@v2
       with:
         name: testreport-grass-${{ matrix.grass-version }}-python-${{ matrix.python-version }}
-        path: grass-addons/grass7/testreport
+        path: grass-addons/src/testreport
         retention-days: 3
diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml
@@ -1,64 +1,26 @@
 name: Python Flake8 Code Quality
 
 on:
-- push
-- pull_request
+  - push
+  - pull_request
 
 jobs:
-
-  flake8-grass7-scripts:
-    name: ${{ matrix.directory }}
+  flake8:
     runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        directory:
-        - grass7/db
-        - grass7/display
-        - grass7/general
-        - grass7/imagery
-        - grass7/misc
-        - grass7/raster
-        - grass7/raster3d
-        - grass7/temporal
-        - grass7/tools
-        - grass7/vector
-      fail-fast: false
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.8
-
-    - name: Install
-      run: |
-        python -m pip install --upgrade pip
-        pip install flake8==3.8.4
-
-    - name: Run Flake8 in ${{ matrix.directory }}
-      run: |
-        cd ${{ matrix.directory }}
-        flake8 --config=../.flake8 --count --statistics --show-source --jobs=$(nproc) .
+      - uses: actions/checkout@v2
 
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
 
-  flake8-gui-wxgui:
-    name: grass7/gui
-    runs-on: ubuntu-20.04
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.8
+      - name: Install
+        run: |
+          python -m pip install --upgrade pip
+          pip install flake8==3.8.4
 
-    - name: Install
-      run: |
-        python -m pip install --upgrade pip
-        pip install flake8==3.8.4
-    - name: Run Flake8
-      # use own local flake8 settings file
-      run: |
-        cd grass7/gui/wxpython/
-        flake8 --config=./.flake8 --count --statistics --show-source --jobs=$(nproc) .
+      - name: Run Flake8
+        run: |
+          flake8 --count --statistics --show-source --jobs=$(nproc) .
diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml
@@ -0,0 +1,32 @@
+name: General linting
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  super-linter:
+    name: GitHub Super Linter
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Lint code base
+        uses: docker://github/super-linter:v2.2.2
+        env:
+          # Listed but disabled linters would be nice to have.
+          # Python (supported using Pylint) and C/C++ (not supported) are
+          # handled separately due to the complexity of the settings.
+          # (The rest is simply disabled automatically as of v2.)
+          VALIDATE_BASH: false
+          VALIDATE_CSS: false
+          VALIDATE_DOCKER: false
+          VALIDATE_JAVASCRIPT_ES: true
+          VALIDATE_JAVASCRIPT_STANDARD: false
+          VALIDATE_JSON: true
+          VALIDATE_MD: false
+          VALIDATE_PERL: false
+          VALIDATE_POWERSHELL: true
+          VALIDATE_XML: false
+          VALIDATE_YAML: true
diff --git a/.github/workflows/test.sh b/.github/workflows/test.sh
@@ -3,10 +3,13 @@
 # fail on non-zero return code from a subprocess
 set -e
 
+# Install module from addons if not available (in v7).
+if ! grass --tmp-location XY --exec g.download.location --help; then
+    grass --tmp-location XY --exec \
+        g.extension g.download.location
+fi
 grass --tmp-location XY --exec \
-    g.extension g.download.location
-grass --tmp-location XY --exec \
-    g.download.location url=https://grass.osgeo.org/sampledata/north_carolina/nc_spm_full_v2alpha2.tar.gz dbase=$HOME
+    g.download.location url=https://grass.osgeo.org/sampledata/north_carolina/nc_spm_full_v2alpha2.tar.gz path=$HOME
 
 grass --tmp-location XY --exec \
     python3 -m grass.gunittest.main \

diff --git a/.gitignore b/.gitignore
@@ -1,13 +1,4 @@
 OBJ.*
 *.pyc
-# grass7/misc/m.eigensystem
 *.o
 *.tmp.html
-grass6/raster/r.inund.fluv/2d_path
-grass6/raster/r.inund.fluv/clean_inundation
-grass6/raster/r.inund.fluv/correction_from_path
-grass6/raster/r.inund.fluv/dati.mod
-grass6/raster/r.inund.fluv/dd.mod
-grass6/raster/r.inund.fluv/find_main_channel
-grass6/raster/r.roughness/r.roughness.window.vector
-grass6/vector/v.in.postgis/v.in.postgis
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -15,8 +15,8 @@ on GitHub.
 
 ## Changing code and documentation
 
-This guide covers contributing to the main version of GRASS GIS Addons
-source code which is stored the master branch.
+This guide covers contributing to the latest version of GRASS GIS Addons
+source code which is stored in a branch called _grass8_.
 It assumes that you have some very basic knowledge of Git and GitHub,
 but if you don't just go through some tutorial online or ask on the
 GRASS GIS developer mailing list.
@@ -65,22 +65,22 @@ It is important that "origin" points to your fork.
 
 ### Update before creating a feature branch
 
-* Make sure your are using master branch:
+* Make sure your are starting with the branch for the latest version, i.e., _grass8_:
 
 ```
-git checkout master
+git checkout grass8
 ```
 
-* Download updates from all branches from all remotes:
+* Download updates from all branches from the _upstream_ remote:
 
 ```
 git fetch upstream
 ```
 
-* Update your local master branch to match master in the main repository:
+* Update your local branch to match the one in the upstream repository:
 
 ```
-git rebase upstream/master
+git rebase upstream/grass8
 ```
 
 ### Update if you have local branches
@@ -95,7 +95,7 @@ git stash
 * Now you can rebase:
 
 ```
-git rebase upstream/master
+git rebase upstream/grass8
 ```
 
 * Apply your local changes on top:
@@ -112,7 +112,7 @@ git stash pop
 
 ### Creating a new feature branch
 
-Now you have updated your local master branch, you can create a feature branch
+Now you have updated your local branch, you can create a feature branch
 based on it.
 
 * Create a new feature branch and switch to it:
@@ -165,11 +165,11 @@ GRASS GIS maintainers or users will now review your pull request.
 If needed, they will work with you to improve your changes.
 
 Once the changes in the pull request are ready to be accepted,
-the maintainers will decide if it is more appropriate to:
+the maintainers will usually squash all your commits into one commit and merge it
+to the _grass8_ branch.
 
-* merge your feature branch,
-* squash all commit into one commit, or
-* rebase (i.e., replay) all commits on top of the master branch.
+Once the pull request is merged, it is a good time to update your
+local _grass8_ branch in order to get there the change you just contributed.
 
 ### Further notes