version: Start 8.4.0dev (OSGeo#2964)

Includes VERSION file change generated by the newly updated update_version.py script and changes done manually replacing 8.3 with 8.4. Also includes removal of trailing space keyword in CITATION.cff file enforced by pre-commit. Does not include updates for man/sphinx.
VeronicaKoess · May 18, 2023 · 70ecf8e · 70ecf8e
1 parent 43b7222
commit 70ecf8e
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 22 deletions.
diff --git a/.github/workflows/osgeo4w.yml b/.github/workflows/osgeo4w.yml
@@ -63,10 +63,10 @@ jobs:
         run: D:\msys64\usr\bin\bash.exe -l (''+(Get-Location)+'\.github\workflows\build_osgeo4w.sh') (Get-Location)
 
       - name: Test executing of the grass command
-        run: .github/workflows/test_simple.bat 'C:\OSGeo4W\opt\grass\grass83.bat'
+        run: .github/workflows/test_simple.bat 'C:\OSGeo4W\opt\grass\grass84.bat'
 
       - name: Test executing of the grass command in bash
         run: D:\msys64\usr\bin\bash.exe .github/workflows/test_simple.sh
 
       - name: Run tests
-        run: .github/workflows/test_thorough.bat 'C:\OSGeo4W\opt\grass\grass83.bat' 'C:\OSGeo4W\bin\python3'
+        run: .github/workflows/test_thorough.bat 'C:\OSGeo4W\opt\grass\grass84.bat' 'C:\OSGeo4W\bin\python3'
diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
@@ -75,22 +75,22 @@ jobs:
       - name: Run Pylint on grass package
         run: |
           export PYTHONPATH=`grass --config python_path`:$PYTHONPATH
-          export LD_LIBRARY_PATH=$HOME/install/grass83/lib:$LD_LIBRARY_PATH
+          export LD_LIBRARY_PATH=$HOME/install/grass84/lib:$LD_LIBRARY_PATH
           cd python
           pylint --persistent=no --py-version=${{ matrix.min-python-version }} --jobs=$(nproc) grass
 
       - name: Run Pylint on wxGUI
         run: |
           export PYTHONPATH=`grass --config python_path`:$PYTHONPATH
-          export LD_LIBRARY_PATH=$HOME/install/grass83/lib:$LD_LIBRARY_PATH
+          export LD_LIBRARY_PATH=$HOME/install/grass84/lib:$LD_LIBRARY_PATH
           cd gui/wxpython
           pylint --persistent=no --py-version=${{ matrix.min-python-version }} --jobs=$(nproc) *
 
       - name: Run Pylint on other files using pytest
         run: |
           pip install pytest pytest-pylint
           export PYTHONPATH=`grass --config python_path`:$PYTHONPATH
-          export LD_LIBRARY_PATH=$HOME/install/grass83/lib:$LD_LIBRARY_PATH
+          export LD_LIBRARY_PATH=$HOME/install/grass84/lib:$LD_LIBRARY_PATH
           pytest --pylint -m pylint --pylint-rcfile=.pylintrc --pylint-jobs=$(nproc) \
             --pylint-ignore-patterns="${{ env.PylintIgnore }}"
         env:

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -72,7 +72,7 @@ jobs:
       - name: Run pytest
         run: |
           export PYTHONPATH=`grass --config python_path`:$PYTHONPATH
-          export LD_LIBRARY_PATH=$HOME/install/grass83/lib:$LD_LIBRARY_PATH
+          export LD_LIBRARY_PATH=$HOME/install/grass84/lib:$LD_LIBRARY_PATH
           pytest .
 
       - name: Print installed versions

diff --git a/CITATION.cff b/CITATION.cff
@@ -2,7 +2,7 @@ cff-version: 1.2.0
 message: If you use this software, please cite it using the metadata from this file.
 
 title: GRASS GIS
-version: 8.3.0
+version: 8.4.0
 abstract: GRASS GIS (Geographic Resources Analysis Support System) is a free and open source Geographic Information System (GIS) software used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization.
 
 authors:
@@ -108,7 +108,7 @@ authors:
 repository-code: https://github.com/OSGeo/grass
 license: GNU General Public License v2 or later
 doi: 10.5281/zenodo.4621728
-keywords: 
+keywords:
   - GIS
   - geospatial
   - spatial analysis
@@ -119,5 +119,5 @@ keywords:
   - GNU GPL v2
 
 citation:
-  - text: GRASS Development Team. (2023). Geographic Resources Analysis Support System (GRASS GIS) Software, Version 8.3.0. Open Source Geospatial Foundation. https://grass.osgeo.org
+  - text: GRASS Development Team. (2023). Geographic Resources Analysis Support System (GRASS GIS) Software, Version 8.4.0. Open Source Geospatial Foundation. https://grass.osgeo.org
     doi: 10.5281/zenodo.4621728
diff --git a/Dockerfile b/Dockerfile
@@ -193,7 +193,7 @@ ENV GRASS_SKIP_MAPSET_OWNER_CHECK 1
 ENV PROJ_NETWORK=ON
 
 # Create generic GRASS GIS lib name regardless of version number
-RUN ln -sf /usr/local/grass83 /usr/local/grass
+RUN ln -sf /usr/local/grass84 /usr/local/grass
 
 # show GRASS GIS, PROJ, GDAL etc versions
 RUN grass --tmp-location EPSG:4326 --exec g.version -rge && \

diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile
@@ -167,13 +167,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/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;
+RUN cp /usr/local/grass84/gui/wxpython/xml/module_items.xml module_items.xml; \
+    rm -rf /usr/local/grass84/demolocation; \
+    rm -rf /usr/local/grass84/fonts; \
+    rm -rf /usr/local/grass84/gui; \
+    rm -rf /usr/local/grass84/share; \
+    mkdir -p /usr/local/grass84/gui/wxpython/xml/; \
+    mv module_items.xml /usr/local/grass84/gui/wxpython/xml/module_items.xml;
 
 
 FROM common as grass

diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile
@@ -195,7 +195,7 @@ ENV GRASS_SKIP_MAPSET_OWNER_CHECK 1
 ENV PROJ_NETWORK=ON
 
 # Create generic GRASS GIS lib name regardless of version number
-RUN ln -sf /usr/local/grass83 /usr/local/grass
+RUN ln -sf /usr/local/grass84 /usr/local/grass
 
 # show GRASS GIS, PROJ, GDAL etc versions
 RUN grass --tmp-location EPSG:4326 --exec g.version -rge && \

diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile
@@ -193,7 +193,7 @@ ENV GRASS_SKIP_MAPSET_OWNER_CHECK 1
 ENV PROJ_NETWORK=ON
 
 # Create generic GRASS GIS lib name regardless of version number
-RUN ln -sf /usr/local/grass83 /usr/local/grass
+RUN ln -sf /usr/local/grass84 /usr/local/grass
 
 # show GRASS GIS, PROJ, GDAL etc versions
 RUN grass --tmp-location EPSG:4326 --exec g.version -rge && \

diff --git a/docker/ubuntu_wxgui/Dockerfile b/docker/ubuntu_wxgui/Dockerfile
@@ -230,7 +230,7 @@ ENV GRASS_SKIP_MAPSET_OWNER_CHECK 1
 ENV PROJ_NETWORK=ON
 
 # Create generic GRASS GIS lib name regardless of version number
-RUN ln -sf /usr/local/grass83 /usr/local/grass
+RUN ln -sf /usr/local/grass84 /usr/local/grass
 
 # show GRASS GIS, PROJ, GDAL etc versions
 RUN grass --tmp-location EPSG:4326 --exec g.version -rge && \

diff --git a/include/VERSION b/include/VERSION
@@ -1,4 +1,4 @@
 8
-3
-dev
+4
+0dev
 2023