main: Update grass80/grass81 to grass83 (#2330)

Update various mentions of grass80 and grass81 -> grass83

INSTALL

@@ -40,11 +40,11 @@ Installation order:
 
 GRASS source code is currently distributed in 2 forms:
 
-1) Officially released source code (e.g. grass-8.0.0.tar.gz or later)
+1) Officially released source code (e.g. grass-8.2.0.tar.gz or later)
 
-  The Full source code version contains all the GRASS source code
+  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. 8.0.0, 8.0.1
+  package) and the version is composed of 3 numbers, e.g. 8.2.0, 8.2.1
   etc. See
   https://github.com/OSGeo/grass/releases
 
@@ -54,7 +54,7 @@ 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-8.1.git_src_snapshot_2022_01_12.tar.gz
+  the GitHub repository), e.g. grass-8.3.git_src_snapshot_2022_04_27.tar.gz
   from https://grass.osgeo.org/grass-devel/source/snapshot/
   Further instructions at https://trac.osgeo.org/grass/wiki/DownloadSource
 

README.md

@@ -42,7 +42,7 @@ Build a docker image using the downloaded source code (run this in the directory
 containing the source code):
 
 ```
-docker build -t grassgis80 .
+docker build -t grassgis .
 ```
 
 A test run (assuming you have the existing GRASS GIS test location; it can be
@@ -52,24 +52,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/ grassgis80 grass --text nc_basic_spm_grass7/user1 \
+    --env HOME=/data/ grassgis 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/ grassgis80 \
+    --volume /your/test/grassdata/:/data --env HOME=/data/ grassgis \
         grass /data/nc_basic_spm_grass7/PERMANENT --exec g.region -p
 ```
 
-Note that the first `grassgis80` is the name of the image while the second
+Note that the first `grassgis` 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 \
-        grassgis80 grass /data/nc_basic_spm_grass7/PERMANENT --exec \
+        grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
             python -m grass.gunittest.main \
                 --location nc_basic_spm_grass7 --location-type nc
 ```

docker/README.md

@@ -4,15 +4,15 @@
 
 | Base image   | Docker tag      | GRASS GIS  | PROJ  | GDAL  | PDAL  | Python | Image size |
 |--------------|-----------------|------------|-------|-------|-------|--------|------------|
-| Ubuntu 20.04 | latest-ubuntu   | 8.1.dev    | 6.3.1 | 3.0.4 | 2.2.0 | 3.8.10 | 1.20 GB    |
-| Debian 10.1  | latest-debian   | 8.1.dev    | 5.2.0 | 2.4.0 | 1.8.0 | 3.7.3  | 1.16 GB    |
-| Alpine 3.12  | latest-alpine   | 8.1.dev    | 7.0.1 | 3.1.4 | 2.1.0 | 3.8.10 |  186 MB    |
+| Ubuntu 20.04 | latest-ubuntu   | 8.3.dev    | 6.3.1 | 3.0.4 | 2.2.0 | 3.8.10 | 1.20 GB    |
+| Debian 10.1  | latest-debian   | 8.3.dev    | 5.2.0 | 2.4.0 | 1.8.0 | 3.7.3  | 1.16 GB    |
+| Alpine 3.12  | latest-alpine   | 8.3.dev    | 7.0.1 | 3.1.4 | 2.1.0 | 3.8.10 |  186 MB    |
 |--------------|-----------------|------------|-------|-------|-------|--------|------------|
-| Ubuntu 20.04 | stable-ubuntu   | 8.0 branch | 6.3.1 | 3.0.4 | 2.2.0 | 3.8.10 | 1.20 GB    |
-| Debian 10.1  | stable-debian   | 8.0 branch | 5.2.0 | 2.4.0 | 1.8.0 | 3.7.3  | 1.16 GB    |
-| Alpine 3.12  | stable-alpine   | 8.0 branch | 7.0.1 | 3.1.4 | 2.1.0 | 3.8.10 |  186 MB    |
+| Ubuntu 20.04 | stable-ubuntu   | 8.2 branch | 6.3.1 | 3.0.4 | 2.2.0 | 3.8.10 | 1.20 GB    |
+| Debian 10.1  | stable-debian   | 8.2 branch | 5.2.0 | 2.4.0 | 1.8.0 | 3.7.3  | 1.16 GB    |
+| Alpine 3.12  | stable-alpine   | 8.2 branch | 7.0.1 | 3.1.4 | 2.1.0 | 3.8.10 |  186 MB    |
 
-Last update: 15 Mar 2022 (source: https://github.com/OSGeo/grass/actions/workflows/docker.yml and https://hub.docker.com/r/mundialis/grass-py3-pdal/tags)
+Last update: 27 Apr 2022 (source: https://github.com/OSGeo/grass/actions/workflows/docker.yml and https://hub.docker.com/r/mundialis/grass-py3-pdal/tags)
 
 # Requirements
 

docker/alpine/Dockerfile

@@ -165,13 +165,13 @@ RUN echo "  => Configure and compile grass" && \
     ldconfig /etc/ld.so.conf.d
 
 # Reduce the image size - Remove unnecessary grass files
-RUN cp /usr/local/grass81/gui/wxpython/xml/module_items.xml module_items.xml; \
-    rm -rf /usr/local/grass81/demolocation; \
-    rm -rf /usr/local/grass81/fonts; \
-    rm -rf /usr/local/grass81/gui; \
-    rm -rf /usr/local/grass81/share; \
-    mkdir -p /usr/local/grass81/gui/wxpython/xml/; \
-    mv module_items.xml /usr/local/grass81/gui/wxpython/xml/module_items.xml;
+RUN cp /usr/local/grass83/gui/wxpython/xml/module_items.xml module_items.xml; \
+    rm -rf /usr/local/grass83/demolocation; \
+    rm -rf /usr/local/grass83/fonts; \
+    rm -rf /usr/local/grass83/gui; \
+    rm -rf /usr/local/grass83/share; \
+    mkdir -p /usr/local/grass83/gui/wxpython/xml/; \
+    mv module_items.xml /usr/local/grass83/gui/wxpython/xml/module_items.xml;
 
 
 FROM common as grass

docker/alpine/Dockerfile_alpine_latest

@@ -170,10 +170,10 @@ RUN echo "  => Configure and compile grass";\
     rm -rf /var/cache/apk/*; \
     rm -rf /root/.cache; \
     # Remove unnecessary grass files
-    rm -rf /usr/local/grass81/demolocation; \
-    rm -rf /usr/local/grass81/fonts; \
-    rm -rf /usr/local/grass81/gui; \
-    rm -rf /usr/local/grass81/share;
+    rm -rf /usr/local/grass83/demolocation; \
+    rm -rf /usr/local/grass83/fonts; \
+    rm -rf /usr/local/grass83/gui; \
+    rm -rf /usr/local/grass83/share;
 
 
 # Unset environmental variables to avoid later compilation issues

docker/debian/Dockerfile

@@ -209,7 +209,7 @@ ENV LC_ALL "en_US.UTF-8"
 ENV GRASS_SKIP_MAPSET_OWNER_CHECK 1
 
 # Create generic GRASS GIS lib name regardless of version number
-RUN ln -sf /usr/local/grass81 /usr/local/grass
+RUN ln -sf /usr/local/grass83 /usr/local/grass
 
 # show GRASS GIS, PROJ, GDAL etc versions
 RUN grass --tmp-location EPSG:4326 --exec g.version -rge && \

docker/ubuntu/Dockerfile

@@ -201,7 +201,7 @@ ENV LC_ALL "en_US.UTF-8"
 ENV GRASS_SKIP_MAPSET_OWNER_CHECK 1
 
 # Create generic GRASS GIS lib name regardless of version number
-RUN ln -sf /usr/local/grass81 /usr/local/grass
+RUN ln -sf /usr/local/grass83 /usr/local/grass
 
 # show GRASS GIS, PROJ, GDAL etc versions
 RUN grass --tmp-location EPSG:4326 --exec g.version -rge && \

general/g.version/g.version.html

@@ -38,35 +38,35 @@ <h3>Basic info</h3>
 <div class="code"><pre>
 g.version 
 
-GRASS 8.0.0alpha (2021)
+GRASS 8.2.0dev (2022)
 </pre></div>
 
 <h3>GIS Library info</h3>
 
 <div class="code"><pre>
 g.version -r
 
-GRASS 8.0.0alpha (2021)
-libgis revision: 1e0c11f52
-libgis date: 2021-05-19T09:38:49+00:00
+GRASS 8.2.0dev (2022)
+libgis revision: c9e8576cf
+libgis date: 2022-04-27T09:38:49+00:00
 </pre></div>
 
 <h3>Full info in shell script style</h3>
 <div class="code"><pre>
 g.version -rge
 
-version=8.0.0alpha
-date=2021
+version=8.2.0dev
+date=2022
 revision=d57f40906
 build_date=2021-05-23
 build_platform=x86_64-pc-linux-gnu
 build_off_t_size=8
-libgis_revision=1e0c11f52
-libgis_date=2021-05-19T09:38:49+00:00
-proj=6.3.2
-gdal=3.1.4
-geos=3.8.1
-sqlite=3.34.1
+libgis_revision=c9e8576cf
+libgis_date=2022-04-27T09:38:49+00:00
+proj=8.2.1
+gdal=3.4.3
+geos=3.9.2
+sqlite=3.36.0
 </pre></div>
 
 Note: if <tt>revision=exported</tt> is reported instead of the git hash then the

lib/init/grass.html

@@ -135,7 +135,7 @@ <h3>Config flag</h3>
 <li><b>python_path</b>: (e.g., <tt>/usr/lib64/grass/etc/python</tt>)</li>
 <li><b>revision</b>: (e.g., <tt>745ee7ec9</tt>)</li>
 <li><b>svn_revision</b>: (e.g., <tt>062bffc8</tt>)</li>
-<li><b>version</b>: (e.g., <tt>8.0.0dev</tt>)</li>
+<li><b>version</b>: (e.g., <tt>8.2.0dev</tt>)</li>
 </ul>
 
 <h2>SAMPLE DATA</h2>

man/sphinx/Makefile

@@ -77,17 +77,17 @@ qthelp:
 	@echo
 	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
 	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/GRASS81Documentation.qhcp"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/GRASS83Documentation.qhcp"
 	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/GRASS81Documentation.qhc"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/GRASS83Documentation.qhc"
 
 devhelp:
 	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
 	@echo
 	@echo "Build finished."
 	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/GRASS81Documentation"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/GRASS81Documentation"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/GRASS83Documentation"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/GRASS83Documentation"
 	@echo "# devhelp"
 
 epub:

man/sphinx/conf.py

@@ -1,5 +1,5 @@
 #
-# GRASS GIS 8.1 Documentation documentation build configuration file, created by
+# GRASS GIS 8.3 Documentation documentation build configuration file, created by
 # sphinx-quickstart on Thu Aug  9 17:16:28 2012.
 #
 # This file is execfile()d with the current directory set to its containing dir.
@@ -37,15 +37,15 @@
 master_doc = "index"
 
 # General information about the project.
-project = "GRASS GIS 8.1 Documentation"
+project = "GRASS GIS 8.3 Documentation"
 copyright = "2022, GRASS Development Team"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = "8.1"
+version = "8.3"
 # The full version, including alpha/beta/rc tags.
 release = "dev"
 
@@ -161,7 +161,7 @@
 # html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = "grass81Documentationdoc"
+htmlhelp_basename = "grass83Documentationdoc"
 
 
 # -- Options for LaTeX output --------------------------------------------------
@@ -180,8 +180,8 @@
 latex_documents = [
     (
         "content",
-        "grass81Documentation.tex",
-        "GRASS GIS 8.1 Documentation",
+        "grass83Documentation.tex",
+        "GRASS GIS 8.3 Documentation",
         "GRASS Development Team",
         "manual",
     ),
@@ -215,8 +215,8 @@
 man_pages = [
     (
         "content",
-        "grass81documentation",
-        "GRASS GIS 8.1 Documentation",
+        "grass83documentation",
+        "GRASS GIS 8.3 Documentation",
         ["GRASS Development Team"],
         1,
     )
@@ -234,10 +234,10 @@
 texinfo_documents = [
     (
         "content",
-        "grass81Documentation",
-        "GRASS GIS 8.1 Documentation",
+        "grass83Documentation",
+        "GRASS GIS 8.3 Documentation",
         "GRASS Development Team",
-        "grass81Documentation",
+        "grass83Documentation",
         "One line description of project.",
         "Miscellaneous",
     ),
@@ -256,7 +256,7 @@
 # -- Options for Epub output ---------------------------------------------------
 
 # Bibliographic Dublin Core info.
-epub_title = "GRASS GIS 8.1 Documentation"
+epub_title = "GRASS GIS 8.3 Documentation"
 epub_author = "GRASS Development Team"
 epub_publisher = "GRASS Development Team"
 epub_copyright = "2022, GRASS Development Team"

man/sphinx/make.bat

@@ -99,9 +99,9 @@ if "%1" == "qthelp" (
 	echo.
 	echo.Build finished; now you can run "qcollectiongenerator" with the ^
 .qhcp project file in %BUILDDIR%/qthelp, like this:
-	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\GRASS81Documentation.qhcp
+	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\GRASS83Documentation.qhcp
 	echo.To view the help file:
-	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\GRASS81Documentation.ghc
+	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\GRASS83Documentation.ghc
 	goto end
 )
 

mswindows/crosscompile.sh

@@ -61,7 +61,7 @@ Usage: crosscompile.sh [OPTIONS]
                              (default: /usr/include/freetype2)
     --update                 update the current branch
     --package                package the cross-compiled build as
-                             grass81-x86_64-w64-mingw32-YYYYMMDD.zip
+                             grass83-x86_64-w64-mingw32-YYYYMMDD.zip
 EOT
 		exit
 		;;

python/grass/gunittest/multirunner.py

@@ -117,7 +117,7 @@ def main():
     # TODO: create directory according to date and revision and create reports there
 
     # some predefined variables, name of the GRASS launch script + location/mapset
-    # grass8bin = 'C:\Program Files (x86)\GRASS GIS 8.0.git\grass.bat'
+    # grass8bin = 'C:\Program Files (x86)\GRASS GIS 8.2.git\grass.bat'
     grass8bin = args.grassbin  # TODO: can be used if pressent
 
     # Software

python/grass/script/setup.py

@@ -29,11 +29,11 @@
         # MS Windows
         grass8bin = r"C:\OSGeo4W\bin\grass.bat"
         # uncomment when using standalone WinGRASS installer
-        # grass8bin = r'C:\Program Files (x86)\GRASS GIS 8.0.0\grass.bat'
+        # grass8bin = r'C:\Program Files (x86)\GRASS GIS 8.2.0\grass.bat'
         # this can be avoided if GRASS executable is added to PATH
     elif sys.platform == "darwin":
         # Mac OS X
-        grass8bin = "/Applications/GRASS-8.0.app/Contents/Resources/bin/grass"
+        grass8bin = "/Applications/GRASS-8.2.app/Contents/Resources/bin/grass"
 
     # query GRASS GIS itself for its Python package path
     grass_cmd = [grass8bin, "--config", "python_path"]

rpm/grass.spec

@@ -1,8 +1,8 @@
-%global shortver 80
+%global shortver 82
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:		grass
-Version:	8.0.0
+Version:	8.2.0
 Release:	1%{?dist}
 Summary:	GRASS GIS - Geographic Resources Analysis Support System