From 305f692a90c54abd517e65898331a49af38f1f30 Mon Sep 17 00:00:00 2001 From: Vaclav Petras Date: Wed, 1 May 2024 18:29:10 -0400 Subject: [PATCH] version: Replace references to 8.2 (#2969) * version: Replace references to 8.2 - Links to latest (current) stable in notebooks use the grass-stable URL. - singularity: Use tag instead of branch. Use an old tag for the example. Missing or need to be resolved elsewhere: general/g.version/g.version.html rpm/grass.spec doc/howto_release.md doc/development/submitting/general.md lib/init/grass.html * Update to 8.4.0 and new format for date for grass.html * Update to 8.4.0 and 2024 for g.version * Checkout "{tag or branch}" not 8.2.0 in an example. --- doc/notebooks/jupyter_example.ipynb | 2 +- doc/notebooks/jupyter_tutorial.ipynb | 2 +- general/g.version/g.version.html | 14 +++++++------- lib/init/grass.html | 4 ++-- singularity/debian/README_debian.md | 8 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/doc/notebooks/jupyter_example.ipynb b/doc/notebooks/jupyter_example.ipynb index 48628e08263..67245172461 100644 --- a/doc/notebooks/jupyter_example.ipynb +++ b/doc/notebooks/jupyter_example.ipynb @@ -8,7 +8,7 @@ "\n", "[\"GRASS](https://grass.osgeo.org/)\n", "\n", - "This is a quick introduction to *GRASS GIS* in a *Jupyter Notebook* using the [_grass.jupyter_](https://grass.osgeo.org/grass82/manuals/libpython/grass.jupyter.html) package and the *Python* scripting language. The _grass.jupyter_ package simplifies the launch of *GRASS GIS* in *Jupyter Notebook* and provides several useful classes for creating, displaying, and saving *GRASS GIS* maps.\n", + "This is a quick introduction to *GRASS GIS* in a *Jupyter Notebook* using the [_grass.jupyter_](https://grass.osgeo.org/grass-stable/manuals/libpython/grass.jupyter.html) package and the *Python* scripting language. The _grass.jupyter_ package simplifies the launch of *GRASS GIS* in *Jupyter Notebook* and provides several useful classes for creating, displaying, and saving *GRASS GIS* maps.\n", "\n", "The _grass.jupyter_ package was initially written as part of Google Summer of Code in 2021 by Caitlin Haedrich and was experimentally included in version 8.0.0. Caitlin further improved it thanks to the GRASS Mini Grant 2022. The package was officially released for the first time as part of version 8.2.0. If you are curious about how the package improves the integration of *GRASS GIS* and *Jupyter Notebooks*, compare it with [scripting_example.ipynb](scripting_example.ipynb). More features of the _grass.jupyter_ package are presented in [jupyter_tutorial.ipynb](jupyter_tutorial.ipynb).\n", "\n", diff --git a/doc/notebooks/jupyter_tutorial.ipynb b/doc/notebooks/jupyter_tutorial.ipynb index 73d656905f7..339b78597a3 100644 --- a/doc/notebooks/jupyter_tutorial.ipynb +++ b/doc/notebooks/jupyter_tutorial.ipynb @@ -6,7 +6,7 @@ "source": [ "# The grass.jupyter Package\n", "\n", - "This notebook introduces the [_grass.jupyter_](https://grass.osgeo.org/grass82/manuals/libpython/grass.jupyter.html) package which simplifies the usage of *GRASS GIS* in *Jupyter Notebook*.\n", + "This notebook introduces the [_grass.jupyter_](https://grass.osgeo.org/grass-stable/manuals/libpython/grass.jupyter.html) package which simplifies the usage of *GRASS GIS* in *Jupyter Notebook*.\n", "\n", "The _grass.jupyter_ package was initially written as part of [Google Summer of Code in 2021](https://trac.osgeo.org/grass/wiki/GSoC/2021/JupyterAndGRASS) by Caitlin Haedrich and was experimentally included in version 8.0.0. Caitlin further improved it thanks to the [GRASS Mini Grant 2022](https://trac.osgeo.org/grass/wiki/GSoC/2021/JupyterAndGRASS/MiniGrant2022). The package was officially released for the first time as part of version 8.2.0. Credits for mentoring and additional development go to Vaclav Petras, Helena Mitasova, Stefan Blumentrath, and Anna Petrasova as well as to many members of the GRASS community who provided important feedback.\n", "\n", diff --git a/general/g.version/g.version.html b/general/g.version/g.version.html index 7e1a0bb906f..d72632d932b 100644 --- a/general/g.version/g.version.html +++ b/general/g.version/g.version.html @@ -38,7 +38,7 @@

Basic info

 g.version
 
-GRASS 8.2.0dev (2022)
+GRASS 8.4.0 (2024)

GIS Library info

@@ -46,23 +46,23 @@

GIS Library info

 g.version -r
 
-GRASS 8.2.0dev (2022)
+GRASS 8.4.0 (2024)
 libgis revision: c9e8576cf
-libgis date: 2022-04-27T09:38:49+00:00
+libgis date: 2024-04-27T09:38:49+00:00

Full info in shell script style

 g.version -rge
 
-version=8.2.0dev
-date=2022
+version=8.4.0
+date=2024
 revision=d57f40906
-build_date=2021-05-23
+build_date=2024-05-23
 build_platform=x86_64-pc-linux-gnu
 build_off_t_size=8
 libgis_revision=c9e8576cf
-libgis_date=2022-04-27T09:38:49+00:00
+libgis_date=2024-04-27T09:38:49+00:00
 proj=8.2.1
 gdal=3.4.3
 geos=3.9.2
diff --git a/lib/init/grass.html b/lib/init/grass.html
index 094c2348267..5b2d918fb12 100644
--- a/lib/init/grass.html
+++ b/lib/init/grass.html
@@ -131,12 +131,12 @@ 
Config flag

 
  • arch: system architecture (e.g., x86_64-pc-linux-gnu)
    • 
 
  • build: (e.g., ./configure --with-cxx --enable-largefile --with-proj [...])
    • 
 
  • compiler: (e.g., gcc)
    • 
-
  • date: (e.g., Tue Mar 31 20:34:57 2020 +0200)
    • 
+
  • date: (e.g., 2024-04-10T11:44:54+00:00)
    • 
 
  • path: (e.g., /usr/lib64/grass)
    • 
 
  • python_path: (e.g., /usr/lib64/grass/etc/python)
    • 
 
  • revision: (e.g., 745ee7ec9)
    • 
 
  • svn_revision: (e.g., 062bffc8)
    • 
-
  • version: (e.g., 8.2.0dev)
    • 
+
  • version: (e.g., 8.4.0)
    • 
 
 
 
    SAMPLE DATA
    
diff --git a/singularity/debian/README_debian.md b/singularity/debian/README_debian.md
index 824986042b9..2f1e287873d 100644
--- a/singularity/debian/README_debian.md
+++ b/singularity/debian/README_debian.md
@@ -16,7 +16,7 @@ cd grass
 __Build the singularity with__:
 
 ```bash
-sudo singularity build grass_development.simg singularity/debian/singularity_debian
+sudo singularity build grass_gis.simg singularity/debian/singularity_debian
 ```
 
 __To build a stable version__:
@@ -24,17 +24,17 @@ __To build a stable version__:
 change to the releasebranch or tag you want to build:
 
 ```bash
-git checkout remotes/origin/releasebranch_8_2
+git checkout {tag or branch}
 ```
 
 and build and enter with:
 
 ```bash
-sudo singularity build grass_8_2.simg singularity/debian/singularity_debian
+sudo singularity build grass_gis.simg singularity/debian/singularity_debian
 ```
 
 The image can be used as:
 
 ```bash
-singularity exec containers/grass_8.2.simg grass --version
+singularity exec containers/grass_gis.simg grass --version
 ```