Merge branch 'OSGeo:main' into master

.github/workflows/apt.txt

@@ -22,7 +22,6 @@ python3-numpy
 python3-pil
 python3-ply
 python3-pyvirtualdisplay
-python3-six
 python3-termcolor
 sqlite3
 zlib1g-dev

.github/workflows/docker.yml

@@ -5,43 +5,37 @@ name: Docker
 #
 # Summary
 #
-# job docker-branch-os-matrix:
-# * creates tags latest-alpine, latest-debian and latest-ubuntu for main branch
-# * creates tags stable-alpine, stable-debian and stable-ubuntu for releasebranch_8_2
-# * creates tags <branch_name>-alpine, <branch_name>-debian and <branch_name>-ubuntu for all triggered branches
-#
-# job docker-main-latest:
-# * creates tag latest for main branch
-#
-# job docker-release-os-matrix:
+# job docker-os-matrix:
 # * creates tags <version>-alpine, <version>-debian and <version>-ubuntu for each release
+# * creates tags <branch_name>-alpine, <branch_name>-debian and <branch_name>-ubuntu for all triggered branches
+# * creates tags current-alpine, current-debian and current-ubuntu for releasebranch_8_3
+# * creates tag latest for last stable release with ubuntu os
 
 on:
   push:
     branches:
       - main
       - releasebranch_*
       - '!releasebranch_7_*'
-    tags: ['*.*.*']
+    # tags: ['*.*.*']
     paths-ignore: [doc/**]
   release:
     types: [published]
 
-env:
-  # Additionally mentioned in docker-sha-release-latest
-  # as use of variable fails there
-  DOCKERHUB_REPOSITORY: osgeo/grass-gis
-
 jobs:
 
-  # Only run for push to configured branches, do not run for releases.
-  # Take care of different os. For main branch, created tags are:
-  # latest-alpine, latest-debian, latest-ubuntu
-  # For releasebranch_8_2, created tags are:
-  # stable-alpine, stable-debian, stable-ubuntu
-  docker-branch-os-matrix:
-    name: build and push ${{ matrix.os }} for branch
-    if: startsWith(github.ref, 'refs/heads/') && github.repository_owner == 'OSGeo'
+  # Run for push to configured branches and all published releases.
+  # Take care of different os.
+  # For main branch, created tags are:
+  #     main-alpine, main-debian, main-ubuntu
+  # For releasebranch_8_3, created tags are:
+  #     current-alpine, current-debian, current-ubuntu,
+  #     releasebranch_8_3-alpine, releasebranch_8_3-debian, releasebranch_8_3-ubuntu
+  # For a release, e.g. 8.3.0, created tags are:
+  #     8.3.0-alpine, 8.3.0-debian, 8.3.0-ubuntu and latest (with ubuntu)
+  docker-os-matrix:
+    name: build and push ${{ matrix.os }} for ${{ github.ref }}
+    if: github.repository_owner == 'OSGeo'
     runs-on: ubuntu-latest
 
     strategy:
@@ -58,125 +52,19 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - id: meta
-        name: Create tag name
-        run: |
-          if [ "$GITHUB_REF" == "refs/heads/main" ]
-          then
-            TAG_PREFIX=latest
-          elif [ "$GITHUB_REF" == "refs/heads/releasebranch_8_2" ]
-          then
-            TAG_PREFIX=stable
-          else
-            # use branch name as TAG_PREFIX
-            TAG_PREFIX=`echo $GITHUB_REF|cut -d '/' -f3`
-          fi
-          tag="${DOCKERHUB_REPOSITORY}:${TAG_PREFIX}-${{ matrix.os }}"
-          echo "tags=$tag" >> $GITHUB_OUTPUT
-      - name: Log
-        run: |
-          echo ${{ steps.meta.outputs.tags }}
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN  }}
-      - name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v4
-        with:
-          push: true
-          pull: true
-          context: .
-          tags: ${{ steps.meta.outputs.tags }}
-          file: docker/${{ matrix.os }}/Dockerfile
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
-
-
-  # Only run for push to main branch
-  # Take care of tag latest
-  # This job needs to build the configured image (ubuntu)
-  # again for main branch to create latest tag.
-  docker-main-latest:
-    name: build and push latest for main branch
-    if: github.ref == 'refs/heads/main' && github.repository_owner == 'OSGeo'
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - id: meta
-        name: Create tag name
-        run: |
-          tag=${DOCKERHUB_REPOSITORY}:latest
-          echo "tags=$tag" >> $GITHUB_OUTPUT
-      - name: Log
-        run: echo ${{ steps.meta.outputs.tags }}
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN  }}
-      - name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v4
-        with:
-          push: true
-          pull: true
-          context: .
-          tags: ${{ steps.meta.outputs.tags }}
-          file: docker/ubuntu/Dockerfile
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
-
-
-  # run for releases, take care of release tags
-  docker-release-os-matrix:
-    name: build and push release for ${{ matrix.os }}
-    if: startsWith(github.ref, 'refs/tags/') && github.repository_owner == 'OSGeo'
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        os:
-          - alpine
-          - debian
-          - ubuntu
-      fail-fast: false
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Create image and tag name
+      - name: Docker meta
         id: meta
         uses: docker/metadata-action@v4
         with:
-          # images: ${DOCKERHUB_REPOSITORY}
           images: osgeo/grass-gis
           tags: |
             type=ref,event=tag
+            type=ref,event=branch
+            type=raw,value=current,enable=${{ github.ref == format('refs/heads/{0}', 'releasebranch_8_3') }}
+            type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/8.3') && matrix.os == 'ubuntu' }},suffix=
           flavor: |
             latest=false
-      - id: meta2
-        name: Update tag name
-        run: |
-          tag="${{ steps.meta.outputs.tags }}-${{ matrix.os }}"
-          echo "tags=$tag" >> $GITHUB_OUTPUT
-      - name: Log
-        run: |
-          echo ${{ steps.meta2.outputs.tags }}
+            suffix=-${{ matrix.os }}
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
@@ -193,7 +81,7 @@ jobs:
           push: true
           pull: true
           context: .
-          tags: ${{ steps.meta2.outputs.tags }}
+          tags: ${{ steps.meta.outputs.tags }}
           file: docker/${{ matrix.os }}/Dockerfile
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/osgeo4w.yml

@@ -43,7 +43,7 @@ jobs:
             mingw-w64-x86_64-gcc mingw-w64-x86_64-ccache mingw-w64-x86_64-zlib mingw-w64-x86_64-libiconv
             mingw-w64-x86_64-bzip2 mingw-w64-x86_64-gettext mingw-w64-x86_64-libsystre
             mingw-w64-x86_64-libtre-git mingw-w64-x86_64-libwinpthread-git mingw-w64-x86_64-libpng
-            mingw-w64-x86_64-pcre mingw-w64-x86_64-python3-six
+            mingw-w64-x86_64-pcre
 
       - name: Install OSGeo4W
         run: |
@@ -57,7 +57,7 @@ jobs:
             pdal-devel,netcdf-devel,cairo-devel,fftw,freetype-devel,gdal-ecw,\
             gdal-mrsid,liblas-devel,libxdr,libpq-devel,pdcurses,\
             python3-matplotlib,python3-numpy,python3-ply,python3-pywin32,\
-            python3-six,python3-wxpython,regex-devel,zstd-devel"
+            python3-wxpython,regex-devel,zstd-devel"
 
       - name: Compile GRASS GIS
         run: D:\msys64\usr\bin\bash.exe -l (''+(Get-Location)+'\.github\workflows\build_osgeo4w.sh') (Get-Location)

.pylintrc

@@ -350,7 +350,7 @@ init-import=no
 
 # List of qualified module names which can have objects that can redefine
 # builtins.
-redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io
+redefining-builtins-modules=past.builtins,future.builtins,builtins,io
 
 
 [SIMILARITIES]

.travis/linux.install.sh

@@ -35,7 +35,6 @@ sudo apt-get install --no-install-recommends \
         python3-pil \
         python3-pip \
         python3-ply \
-        python3-six \
         python-wxgtk3.0 \
         unixodbc-dev \
         libnetcdf-dev   \

CITATION.cff

@@ -1,29 +1,32 @@
 cff-version: 1.2.0
-message: If you use this software, please cite it using the metadata from this file.
-
 title: GRASS GIS
+message: If you use this software, please cite it using the metadata from this file.
 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.
-
+type: software
 authors:
-  - name: GRASS Development Team
+  - family-names: GRASS Development Team
     email: [email protected]
     affiliation: Open Source Geospatial Foundation (OSGeo)
-  - name: Martin Landa
+  - given-names: Martin
+    family-names: Landa
     affiliation: Czech Technical University in Prague
     orcid: https://orcid.org/0000-0001-6869-3542
-  - name: Markus Neteler
+  - given-names: Markus
+    family-names: Neteler
     affiliation: mundialis GmbH & Co. KG
     orcid: https://orcid.org/0000-0003-1916-1966
   - given-names: Markus
     family-names: Metz
     email: [email protected]
     affiliation: mundialis GmbH & Co. KG
     orcid: https://orcid.org/0000-0002-4038-8754
-  - name: Anna Petrášová
+  - given-names: Anna
+    family-names: Petrášová
     affiliation: North Carolina State University
     orcid: https://orcid.org/0000-0002-5120-5538
-  - name: Vaclav Petráš
+  - given-names: Vaclav
+    family-names: Petráš
     affiliation: North Carolina State University
     orcid: https://orcid.org/0000-0001-5566-9236
   - given-names: Glynn
@@ -104,9 +107,8 @@ authors:
   - given-names: Hamish
     family-names: Bowman
     email: [email protected]
-
 repository-code: https://github.com/OSGeo/grass
-license: GNU General Public License v2 or later
+license: GPL-2.0-or-later
 doi: 10.5281/zenodo.4621728
 keywords:
   - GIS
@@ -117,7 +119,3 @@ keywords:
   - open source
   - free software
   - GNU GPL v2
-
-citation:
-  - 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

REQUIREMENTS.md

@@ -82,10 +82,6 @@ Note: also the respective development packages (commonly named `xxx-dev` or
   [https://cran.r-project.org](https://cran.r-project.org)
 - **FreeType2** (for TrueType font support and `d.text.freetype`)
   [https://freetype.org/](https://freetype.org/)
-- **Ctypes** (for ctypes interface)
-  Ctypes can be added as a third-party module in Python 2.3 and
-  2.4 - [https://pypi.org/project/ctypes/1.0.2/](https://pypi.org/project/ctypes/1.0.2/)
-  [https://docs.python.org/library/ctypes.html](https://docs.python.org/library/ctypes.html)
 - **wxPython >= 2.8.10.1** (for wxGUI)
   [https://www.wxpython.org](https://www.wxpython.org)
 - **NumPy >= 1.0.4** (for various wxGUI components and pyGRASS)
@@ -107,10 +103,6 @@ Note: also the respective development packages (commonly named `xxx-dev` or
   [https://matplotlib.org/](https://matplotlib.org/)
 - **python-termcolor** (recommended for `g.search.modules`)
   [https://pypi.org/project/termcolor/](https://pypi.org/project/termcolor/)
-- **six** (`python-six`, needed for Python API and for cross-version Python
-  compatibility)
-  [https://pypi.python.org/pypi/six](https://pypi.python.org/pypi/six)
-  [https://github.com/benjaminp/six](https://github.com/benjaminp/six)
 - **FFMPEG or alternative** (for wxGUI Animation tool - `g.gui.module`),
   specifically ffmpeg tool
   [https://ffmpeg.org](https://ffmpeg.org)

Vagrantfile

@@ -71,7 +71,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       "python3-numpy",
       "python3-ply",
       "python3-pil",
-      "python3-six",
       "libnetcdf-dev",
       "netcdf-bin",
       "libblas-dev",

doc/development/rfc/version_numbering.md

@@ -2,7 +2,7 @@
 
 Author: Vaclav Petras
 
-Status: Draft
+Status: Adopted (5 June 2023)
 
 ## Summary
 

doc/python/raster_example_ctypes.py

@@ -29,7 +29,7 @@
 if len(sys.argv) == 2:
     input = sys.argv[1]
 else:
-    input = raw_input("Name of raster map? ")
+    input = input("Name of raster map? ")
 
 # initialize GRASS library
 G_gisinit("")

doc/python/vector_example_ctypes.py

@@ -17,7 +17,7 @@
 if len(sys.argv) == 2:
     input = sys.argv[1]
 else:
-    input = raw_input("Name of vector map? ")
+    input = input("Name of vector map? ")
 
 # initialize GRASS library
 G_gisinit("")

docker/alpine/Dockerfile

@@ -56,7 +56,6 @@ ENV GRASS_RUN_PACKAGES="\
       openblas \
       py3-numpy \
       py3-pillow \
-      py3-six \
       pdal \
       pdal-dev \
       postgresql15-client \

gui/wxpython/.pylintrc

@@ -379,7 +379,7 @@ init-import=no
 
 # List of qualified module names which can have objects that can redefine
 # builtins.
-redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io
+redefining-builtins-modules=past.builtins,future.builtins,builtins,io
 
 
 [SIMILARITIES]

gui/wxpython/animation/dialogs.py

@@ -20,8 +20,6 @@
 @author Anna Petrasova <kratochanna gmail.com>
 """
 
-from __future__ import print_function
-
 import os
 import wx
 import copy