Merge branch 'OSGeo:master' into fix-flake8-warnings-5

.github/workflows/build_osgeo4w.sh

@@ -100,6 +100,8 @@ grass_path=$opt_path/grass
 
 mkdir -p $opt_path
 cp -a $dist $grass_path
+# have a versionless and versioned startup script
+cp -a $bin/grass.py $bin/grass$ver.py
 cp -a $bin/grass$ver.py $grass_path/etc
 cp -a $(ldd $dist/lib/*.dll | awk '/mingw64/{print $3}' |
     sort -u | grep -v 'lib\(crypto\|ssl\)') $grass_path/lib

.github/workflows/osgeo4w.yml

@@ -32,6 +32,6 @@ jobs:
       - name: Compile GRASS GIS
         run: C:\msys64\usr\bin\bash.exe -l (''+(Get-Location)+'\.github\workflows\build_osgeo4w.sh') -p (Get-Location)
       - name: Test executing of the grass command
-        run: .github/workflows/test_simple.bat 'C:\OSGeo4W64\opt\grass\grass79.bat'
+        run: .github/workflows/test_simple.bat 'C:\OSGeo4W64\opt\grass\grass80.bat'
       - name: Run tests
-        run: .github/workflows/test_thorough.bat 'C:\OSGeo4W64\opt\grass\grass79.bat'
+        run: .github/workflows/test_thorough.bat 'C:\OSGeo4W64\opt\grass\grass80.bat'

.github/workflows/test_simple.sh

@@ -3,4 +3,4 @@
 # fail on non-zero return code from a subprocess
 set -e
 
-grass79 --tmp-location EPSG:4326 --exec g.region res=0.1 -p
+grass --tmp-location EPSG:4326 --exec g.region res=0.1 -p

.github/workflows/test_thorough.sh

@@ -3,12 +3,12 @@
 # fail on non-zero return code from a subprocess
 set -e
 
-grass79 --tmp-location XY --exec \
+grass --tmp-location XY --exec \
     g.extension g.download.location
-grass79 --tmp-location XY --exec \
+grass --tmp-location XY --exec \
     g.download.location url=https://grass.osgeo.org/sampledata/north_carolina/nc_spm_full_v2alpha2.tar.gz dbase=$HOME
 
-grass79 --tmp-location XY --exec \
+grass --tmp-location XY --exec \
     python3 -m grass.gunittest.main \
     --grassdata $HOME --location nc_spm_full_v2alpha2 --location-type nc \
     --min-success 80

CHANGES

@@ -1,4 +1,11 @@
-CHANGES current GRASS GIS 7.x compared to previous GRASS GIS 7.x
+CHANGES in GRASS GIS 8.x compared to GRASS GIS 7.x
+
+Efforts have concentrated on making the user experience even better,
+providing many new useful additional functionalities to modules and
+further improving the graphical user interface. The new graphical user
+interface with entirely rewritten startup sequence.
+
+https://trac.osgeo.org/grass/wiki/Grass8/NewFeatures80
 
 See list of releases with changelog at
 https://trac.osgeo.org/grass/wiki/Release

CITING

@@ -15,15 +15,15 @@ number X.Y accordingly):
   Foundation. https://grass.osgeo.org
 * GRASS Development Team, YEAR. Geographic Resources Analysis Support
   System (GRASS) Programmer's Manual. Open Source Geospatial Foundation.
-  Electronic document: https://grass.osgeo.org/programming7
+  Electronic document: https://grass.osgeo.org/programming8
 
 Citing a GRASS GIS Addon (update AUTHOR(S), YEAR, Addon-NAME, and
 version number X.Y accordingly):
 
 * AUTHOR(S), and GRASS Development Team, YEAR Addon-NAME. Geographic
   Resources Analysis Support System (GRASS) Software, Version X.Y.
   Open Source Geospatial Foundation.
-  https://grass.osgeo.org/grass7/manuals/addons/Addon-NAME.html
+  https://grass.osgeo.org/grass8/manuals/addons/Addon-NAME.html
 
 For other (scientific) references, see
 

INSTALL

@@ -40,11 +40,11 @@ Installation order:
 
 GRASS source code is currently distributed in 2 forms:
 
-1) Officially released source code (e.g. grass-7.9.0.tar.gz or later)
+1) Officially released source code (e.g. grass-8.0.0.tar.gz or later)
 
   The Full source code version contains all the GRASS source code
   required for compilation. It is distributed as one file (*.tar.gz
-  package) and the version is composed of 3 numbers, e.g. 7.9.0, 7.9.1
+  package) and the version is composed of 3 numbers, e.g. 8.0.0, 8.0.1
   etc.
 
 2) Snapshots of source code (generated from GitHub)
@@ -53,8 +53,8 @@ GRASS source code is currently distributed in 2 forms:
   repository (https://github.com/OSGeo/grass/) or as a auto-generated snapshot
   (*.tar.gz package) of the GitHub repository. The snapshot name
   contains the date when the snapshot was created (checked out from
-  the GitHub repository), e.g. grass-7.9.git_src_snapshot_2019_07_11.tar.gz
-  from https://grass.osgeo.org/grass79/source/snapshot/
+  the GitHub repository), e.g. grass-8.0.git_src_snapshot_2021_06_12.tar.gz
+  from https://grass.osgeo.org/grass80/source/snapshot/
   Further instructions at https://trac.osgeo.org/grass/wiki/DownloadSource
 
 
@@ -151,16 +151,16 @@ See also CODE OPTIMIZATION below.
 
 After compilation, the resulting code is stored in the directory
     ./dist.$ARCH
-and the scripts (grass79, ...) in
+and the scripts (grass, ...) in
     ./bin.$ARCH
 
 To run GRASS, simply start
-    ./bin.$ARCH/grass79
+    ./bin.$ARCH/grass
 
 or run
 
     make install
-    grass79
+    grass
 
 
 (E) INSTALLATION ON MACOSX
@@ -189,7 +189,7 @@ GitHub, you have to perform a few steps. In general:
 
 In detail:
 
-    cd /where/your/grass7sourcecode/lives/
+    cd /where/your/grass-source-code/lives/
     git fetch --all
     git merge upstream/master
     ./configure ...
@@ -212,9 +212,9 @@ the main source code directory or locally with
     "INST_NOW=y make"
 
 You may want to define an alias for this:
-    alias gmake7='INST_NOW=y make'
+    alias gmake='INST_NOW=y make'
 Then simply compile/install the current module with
-    gmake7
+    gmake
 
 Note: If you keep your module source code outside the standard GRASS
 source code directory structure, you will have to change the relative
@@ -249,7 +249,7 @@ by the local machine at GCC runtime including -mtune.
 To find out optional CFLAGS for your platform, enter:
   gcc -dumpspecs
 
-See also: http://gcc.gnu.org/
+See also: https://gcc.gnu.org/
 
 A real fast GRASS version (and small binaries) will be created with
 LDFLAGS set to "stripping" (but this disables debugging):
@@ -303,7 +303,7 @@ developers mailing list. See https://grass.osgeo.org/development/
 
 The Programmer's manual is generated with doxygen from the source code.
 Please see the README file and the files at:
-https://grass.osgeo.org/programming7/
+https://grass.osgeo.org/programming8/
 
 (N) CONTRIBUTING CODE AND PATCHES
 

NEWS

@@ -1,7 +1,9 @@
 NEWS
 
-GRASS GIS 7
+GRASS GIS 8
+ o https://trac.osgeo.org/grass/wiki/Grass8/NewFeatures80
 
+GRASS GIS 7
  o https://trac.osgeo.org/grass/wiki/Grass7/NewFeatures78
  o https://trac.osgeo.org/grass/wiki/Grass7/NewFeatures76
  o https://trac.osgeo.org/grass/wiki/Grass7/NewFeatures74

README.md

@@ -36,7 +36,7 @@ Build a docker image using the downloaded source code (run this in the directory
 containing the source code):
 
 ```
-docker build -t grassgis79 .
+docker build -t grassgis80 .
 ```
 
 A test run (assuming you have the existing GRASS GIS test location; it can be
@@ -46,24 +46,24 @@ downloaded from
 ```
 # case 1: launching in the grassdata directory in which the location is stored:
 docker run -it --rm --user=$(id -u):$(id -g) --volume $(pwd):/data \
-    --env HOME=/data/ grassgis79 grass --text nc_basic_spm_grass7/user1 \
+    --env HOME=/data/ grassgis80 grass --text nc_basic_spm_grass7/user1 \
         --exec g.region -p
 
 # case 2: launching anywhere
 docker run -it --rm --user=$(id -u):$(id -g) \
-    --volume /your/test/grassdata/:/data --env HOME=/data/ grassgis79 \
+    --volume /your/test/grassdata/:/data --env HOME=/data/ grassgis80 \
         grass /data/nc_basic_spm_grass7/PERMANENT --exec g.region -p
 ```
 
-Note that the first `grassgis79` is the name of the image while the second
+Note that the first `grassgis80` is the name of the image while the second
 `grass` is the name of the executable.
 
 To run the tests (again assuming local location):
 
 ```
 docker run -it --rm --user=$(id -u):$(id -g) \
     --volume /your/test/grassdata/:/data --env HOME=/data/ -w /code/grass \
-        grassgis79 grass /data/nc_basic_spm_grass7/PERMANENT --exec \
+        grassgis80 grass /data/nc_basic_spm_grass7/PERMANENT --exec \
             python -m grass.gunittest.main \
                 --location nc_basic_spm_grass7 --location-type nc
 ```
@@ -79,7 +79,7 @@ make distclean
 
 ## How to generate the 'Programmer's Manual'
 
-You can generate locally the [GRASS GIS Programmer's Manual](https://grass.osgeo.org/programming7/).
+You can generate locally the [GRASS GIS Programmer's Manual](https://grass.osgeo.org/programming8/).
 
 This needs doxygen (<http://www.doxygen.org>) and optionally
 Graphviz dot (<http://www.research.att.com/sw/tools/graphviz/>).

REQUIREMENTS.html

@@ -55,7 +55,7 @@ <h3>General requirements:</h3>
 <a href="https://gdal.org">https://gdal.org</a>
 </li>
 
-<li><b>Python &gt;= 2.7 (recommended &gt;= 3.5)</b> (for temporal framework, scripts, wxGUI, and ctypes interface)<br>
+<li><b>Python &gt;= 3.6</b> (for temporal framework, scripts, wxGUI, and ctypes interface)<br>
 <a href="https://www.python.org">https://www.python.org</a>
 </li>
 

TODO

@@ -41,3 +41,4 @@ See also
 
 http://trac.osgeo.org/grass/wiki/Grass7Planning
 
+http://trac.osgeo.org/grass/wiki/Grass8Planning

db/db.login/db.login.html

@@ -15,8 +15,8 @@ <h2>NOTE</h2>
 file in the user account, specifically
 
 <ul>
-<li> in the 'home' directory, i.e. <tt>$HOME/.grass7/dblogin</tt> (Unix-like systems)</li>
-<li> <tt>%APPDATA%/GRASS7/dblogin</tt> (MS-Windows)</li>
+<li> in the 'home' directory, i.e. <tt>$HOME/.grass8/dblogin</tt> (Unix-like systems)</li>
+<li> <tt>%APPDATA%\Roaming\GRASS8\dblogin</tt> (MS-Windows)</li>
 </ul>
 
 Only the file owner can access this file.

db/drivers/mysql/grass-mesql.html

@@ -85,6 +85,6 @@ <h2>AUTHOR</h2>
 
 <hr class="header">
 <p><a href="index.html">Main index</a> - <a href="database.html">Database index</a> - <a href="topics.html">Topics index</a> - <a href="keywords.html">Keywords Index</a> - <a href="full_index.html">Full index</a></p>
-<p>&copy; 2003-2019 <a href="https://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 7.9 Reference Manual</p>
+<p>&copy; 2003-2021 <a href="https://grass.osgeo.org">GRASS Development Team</a>, GRASS GIS 8.0 Reference Manual</p>
 </body>
 </html>

display/d.legend.vect/d.legend.vect.html

@@ -96,7 +96,7 @@ <h2>SEE ALSO</h2>
 
 <p>
 Check also Python module from
-AddOns: <em><a href="https://grass.osgeo.org/grass7/manuals/addons/d.vect.thematic2.html">d.vect.thematic2</a></em>
+AddOns: <em><a href="https://grass.osgeo.org/grass8/manuals/addons/d.vect.thematic2.html">d.vect.thematic2</a></em>
 
 <h2>AUTHOR</h2>
 

display/d.mon/main.c

@@ -20,7 +20,7 @@
 
  [1] https://github.com/OSGeo/grass/tree/master/display/d.mon/render_cmd.py
  [2] https://github.com/OSGeo/grass/tree/master/lib/display/r_raster.c#L107
- [3] https://grass.osgeo.org/grass79/manuals/displaydrivers.html
+ [3] https://grass.osgeo.org/grass80/manuals/displaydrivers.html
 
 */
 

display/d.vect.thematic/d.vect.thematic.html

@@ -102,7 +102,7 @@ <h2>SEE ALSO</h2>
 
 <p>
 Check also Python module from
-AddOns: <em><a href="https://grass.osgeo.org/grass7/manuals/addons/d.vect.thematic2.html">d.vect.thematic2</a></em>
+AddOns: <em><a href="https://grass.osgeo.org/grass8/manuals/addons/d.vect.thematic2.html">d.vect.thematic2</a></em>
 
 <h2>AUTHOR</h2>
 

doc/grass_database.html

@@ -222,18 +222,26 @@ <h3>Starting GRASS GIS using command line</h3>
 in a given Mapset with only command line interface:
 
 <div class="code"><pre>
-grass79 --text ~/grassdata/mylocation/mymapset
+# Linux, Mac, *BSD, ...:
+grass --text ~/grassdata/nc_spm_08_grass7/user1
+
+# Windows
+grass --text D:\grassdata\nc_spm_08_grass7\user1
 </pre></div>
 
 And the following will create the given Location with projection given
 by the EPSG code and it will start the default interface
 (GUI or command line):
 
 <div class="code"><pre>
-grass79 -c EPSG:5514:3 ~/grassdata/mylocation
+# Linux, Mac, *BSD, ...:
+grass -c EPSG:5514:3 ~/grassdata/mylocation
+
+# Windows
+grass -c EPSG:5514:3 D:\grassdata\mylocation
 </pre></div>
 
-See <a href="grass7.html"><em>grass</em></a> command manual for more details.
+See <a href="grass.html"><em>grass</em></a> command manual for more details.
 
 
 <h3>Creating a New Location with the Location Wizard</h3>
@@ -278,9 +286,9 @@ <h3>Creating a New Location with the Location Wizard</h3>
 <h2>See also</h2>
 
 <em>
-<a href="index.html">GRASS GIS 7 Reference Manual</a>
+<a href="index.html">GRASS GIS 8 Reference Manual</a>
 <br>
-<a href="grass7.html">GRASS GIS 7 startup program manual page</a>
+<a href="grass.html">GRASS GIS 8 startup program manual page</a>
 <br>
 <a href="https://grasswiki.osgeo.org/wiki/Importing_data">Importing data on GRASS Wiki</a>
 <br>

doc/infrastructure.md

@@ -90,7 +90,7 @@ Maintainer: M. Neteler
 * GRASS addons manual HTML:
     * generated during compilation of weekly Linux binary snapshot on grasslxd
 
-* GRASS programmer's manual (https://grass.osgeo.org/programming7/)
+* GRASS programmer's manual (https://grass.osgeo.org/programming8/)
     * HTML: cronjob run Wednesday morning California time
     * HTML: cronjob run Saturday morning California time
     * disabled: PDF: cronjob run Saturday morning California time
@@ -230,7 +230,7 @@ Details:
 
 - Windows-addons: grass-addons/tools/addons/README.txt
 - Addon manual pages cronjob: https://github.com/OSGeo/grass-addons/tree/master/tools/cronjobs_osgeo_lxd
-- Rendered manuals: https://grass.osgeo.org/grass7/manuals/addons/
+- Rendered manuals: https://grass.osgeo.org/grass8/manuals/addons/
 
 The redirect to the latest grass7x directory is defined on grass.osgeo.org:
   /etc/apache2/includes/grass.osgeo.org.inc

doc/python/script/r.example.html

@@ -27,7 +27,7 @@ <h2>SEE ALSO</h2>
 <a href="v.example.html">v.example</a>
 </em>
 
-<a href="https://grass.osgeo.org/programming7/">GRASS Programmer's Manual</a>
+<a href="https://grass.osgeo.org/programming8/">GRASS Programmer's Manual</a>
 
 <h2>AUTHORS</h2>
 

doc/raster/r.example/r.example.html

@@ -28,7 +28,7 @@ <h2>SEE ALSO</h2>
 </em>
 
 <em>
-<a href="https://grass.osgeo.org/programming7/">GRASS Programmer's Manual</a>
+<a href="https://grass.osgeo.org/programming8/">GRASS Programmer's Manual</a>
 </em>
 
 <h2>AUTHORS</h2>

doc/vector/v.example/v.example.html

@@ -27,7 +27,7 @@ <h2>SEE ALSO</h2>
 </em>
 
 <em>
-<a href="https://grass.osgeo.org/programming7/">GRASS Programmer's Manual</a>
+<a href="https://grass.osgeo.org/programming8/">GRASS Programmer's Manual</a>
 </em>
 
 <h2>AUTHORS</h2>

docker/alpine/Dockerfile_alpine

@@ -170,18 +170,14 @@ RUN echo "  => Configure and compile grass" && \
     make install && \
     ldconfig /etc/ld.so.conf.d
 
-# enable simple grass command regardless of version number
-# also important for COPY cmd later
-RUN ln -s `find /usr/local/bin -name "grass*"` /usr/local/bin/grass
-
 # Reduce the image size - Remove unnecessary grass files
-RUN cp /usr/local/grass79/gui/wxpython/xml/module_items.xml module_items.xml; \
-    rm -rf /usr/local/grass79/demolocation; \
-    rm -rf /usr/local/grass79/fonts; \
-    rm -rf /usr/local/grass79/gui; \
-    rm -rf /usr/local/grass79/share; \
-    mkdir -p /usr/local/grass79/gui/wxpython/xml/; \
-    mv module_items.xml /usr/local/grass79/gui/wxpython/xml/module_items.xml;
+RUN cp /usr/local/grass80/gui/wxpython/xml/module_items.xml module_items.xml; \
+    rm -rf /usr/local/grass80/demolocation; \
+    rm -rf /usr/local/grass80/fonts; \
+    rm -rf /usr/local/grass80/gui; \
+    rm -rf /usr/local/grass80/share; \
+    mkdir -p /usr/local/grass80/gui/wxpython/xml/; \
+    mv module_items.xml /usr/local/grass80/gui/wxpython/xml/module_items.xml;
 
 
 FROM common as grass
@@ -197,7 +193,6 @@ RUN apk add curl && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && p
 # install external Python API
 RUN pip3 install --upgrade pip six grass-session --ignore-installed six
 
-RUN ln -s /usr/local/grass /usr/local/grass7
 RUN ln -s /usr/local/grass `grass --config path`
 RUN grass --tmp-location EPSG:4326 --exec g.version -rge && \
     pdal --version && \