Merge branch 'grass8' into sentinel_coverage_download_comp

.github/workflows/additional_checks.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout repository contents
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 31
 
@@ -45,7 +45,7 @@ jobs:
           exclude: mswindows .*\.bat .*/testsuite/data/.*
 
       - name: Set up Python
-        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
+        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
         with:
           python-version: ${{ env.PYTHON_VERSION }}
 

.github/workflows/black.yml

@@ -30,11 +30,11 @@ jobs:
 
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - name: Set up Python
-        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
+        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           cache: "pip"

.github/workflows/ci.yml

@@ -38,14 +38,14 @@ jobs:
 
     steps:
       - name: Checkout core
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           repository: OSGeo/grass
           ref: ${{ matrix.grass-version }}
           path: grass
 
       - name: Checkout addons
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           path: grass-addons
 
@@ -57,7 +57,7 @@ jobs:
               sudo apt-get install -y --no-install-recommends --no-install-suggests
 
       - name: Set up Python ${{ matrix.python-version }} as default Python
-        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
+        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -107,7 +107,7 @@ jobs:
           pip install -r grass-addons/.github/workflows/extra_requirements.txt
 
       - name: Set up R
-        uses: r-lib/actions/setup-r@e6be4b3706e0f39bc7a4cf4496a5f2c4cb840040 # v2.10.1
+        uses: r-lib/actions/setup-r@473c68190595b311a74f208fba61a8d8c0d4c247 # v2.11.1
         with:
           r-version: 4.2.1
 
@@ -121,7 +121,7 @@ jobs:
           ../.github/workflows/test.sh
 
       - name: Make HTML test report available
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         with:
           name: testreport-grass-${{ matrix.grass-version }}-python-${{ matrix.python-version }}
           path: grass-addons/src/testreport

.github/workflows/clang-format-check.yml

@@ -15,7 +15,7 @@ jobs:
     name: Formatting Check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - uses: DoozyX/clang-format-lint-action@c71d0bf4e21876ebec3e5647491186f8797fde31 # v0.18.2

.github/workflows/flake8.yml

@@ -26,10 +26,10 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Set up Python
-        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
+        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
         with:
           python-version: ${{ env.PYTHON_VERSION }}
 

.github/workflows/super-linter.yml

@@ -26,13 +26,13 @@ jobs:
       # To report GitHub Actions status checks
       statuses: write
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           # super-linter needs the full git history to get the
           # list of files that changed across commits
           fetch-depth: 0
       - name: Lint code base
-        uses: super-linter/super-linter@b92721f792f381cedc002ecdbb9847a15ece5bb8 # v7.1.0
+        uses: super-linter/super-linter@85f7611e0f7b53c8573cca84aa0ed4344f6f6a4d # v7.2.1
         env:
           ENABLE_GITHUB_ACTIONS_STEP_SUMMARY: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.pre-commit-config.yaml

@@ -24,7 +24,7 @@ repos:
                 .*\.svg$
           )
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.42.0
+    rev: v0.43.0
     hooks:
       - id: markdownlint-fix
   # Using this mirror lets us use mypyc-compiled black, which is about 2x faster

src/display/d.mon2/d.mon2.html

@@ -4,21 +4,24 @@ <h2>DESCRIPTION</h2>
 wximgview, and wxpyimgview programs a bit simpler to start up.
 <p>
 
-Add this to your ~/.grass.bashrc file:
-<pre>
+Add this to your <tt>~/.grass.bashrc</tt> file:
+
+<div class="code"><pre>
   if [ `echo "$GRASS_VERSION" | cut -f1 -d.` -eq 7 ] ; then
      alias d.mon='eval `d.mon.py -b`'
   fi
-</pre>
+</pre></div>
 
 <p>
 By default the temporary file will be stored in $MAPSET/.tmp/ and cleared
 at the end of the session. You can put it somewhere else with the
 <b>tempfile</b> option. For example, when working remotely with
 PuTTY (ssh without tunnelled X) + Apache:
-<pre>
+
+<div class="code"><pre>
    alias d.mon='eval `d.mon.py -b handler=none tempfile=/var/www/grassmap.png`'
-</pre>
+</pre></div>
+
 then just hit reload in your web browser whenever a refresh is needed.
 
 

src/general/g.citation/g.citation.html

@@ -71,6 +71,6 @@ <h2>SEE ALSO</h2>
 
 <h2>AUTHORS</h2>
 
-Vaclav Petras, <a href="http://geospatial.ncsu.edu/osgeorel/">NCSU GeoForAll Lab</a> (ORCID: 0000-0001-5566-9236)<br>
+Vaclav Petras, <a href="https://geospatial.ncsu.edu/geoforall/">NCSU GeoForAll Lab</a> (ORCID: 0000-0001-5566-9236)<br>
 Peter Loewe (ORCID: 0000-0003-2257-0517)<br>
 Markus Neteler, <a href="https://www.mundialis.de">mundialis</a> (ORCID: 0000-0003-1916-1966)

src/general/g.citation/g.citation.py

@@ -262,7 +262,7 @@ def get_orcid(text):
     Any whitespace is stripped from the text.
 
     >>> # URL style
-    >>> print(get_orcid("http://orcid.org/0000-0000-0000-0000")[0])
+    >>> print(get_orcid("https://orcid.org/0000-0000-0000-0000")[0])
     0000-0000-0000-0000
     >>> # ISBN style
     >>> print(get_orcid("ORCID 0000-0000-0000-0000")[0])
@@ -386,9 +386,9 @@ def get_code_urls_from_documentation(text):
     Returns a tuple with URL of the source code and URL of history of
     the source code.
 
-    >>> text = '<h2>SOURCE CODE</h2><a href="http://osgeo.org/r.spread">r.spread source code</a> (<a href="http://osgeo.org/log/r.spread">history</a>)'
+    >>> text = '<h2>SOURCE CODE</h2><a href="https://github.com/OSGeo/grass/tree/main/raster/r.spread">r.spread source code</a> (<a href="https://github.com/OSGeo/grass/commits/main/raster/r.spread">history</a>)'
     >>> get_code_urls_from_documentation(text)
-    ('http://osgeo.org/r.spread', 'http://osgeo.org/log/r.spread')
+    ('https://github.com/OSGeo/grass/tree/main/raster/r.spread', 'https://github.com/OSGeo/grass/commits/main/raster/r.spread')
     """
     capture = r'<h2>SOURCE CODE</h2>.*<a href="(.+)">[^<]*source code</a>\s+\(<a href="(.+)">history</a>\)'
     match = re.search(capture, text, re.MULTILINE | re.DOTALL | re.IGNORECASE)
@@ -592,7 +592,7 @@ def print_cff(citation, output):
     print("version:", citation["grass-version"], file=output)
     # CFF 1.0.3 does not say expplicitely except for Date (so not any
     # string), so assuming YAML timestamp
-    # (http://yaml.org/type/timestamp.html)
+    # (https://yaml.org/type/timestamp.html)
     # now we have only the year, so using Jan 1
     print("date-released:", citation["grass-build-date"], file=output)
     # license string according to https://spdx.org/licenses/
@@ -693,7 +693,7 @@ def print_bibtex(citation, output):
         sep="",
         file=output,
     )
-    print("  year = {", citation["year"], "}", sep="", file=output)
+    print("  year = {", citation["year"], "},", sep="", file=output)
     print(
         "  note = {Accessed: ",
         citation["access"],
@@ -862,7 +862,7 @@ def grass_cff_reference(grass_version, scope=None):
     citation["type"] = "software"
     # the team as an entity
     citation["authors"] = [
-        {"name": "The GRASS Development Team", "website": "http://grass.osgeo.org/"}
+        {"name": "The GRASS Development Team", "website": "https://grass.osgeo.org/"}
     ]
     citation["title"] = "GRASS GIS {version}".format(**grass_version)
     citation["version"] = grass_version["version"]
@@ -1002,7 +1002,7 @@ def main(options, flags):
 #  organization = {Open Source Geospatial Foundation},
 #  address = {USA},
 #  year = {YEAR},
-#  url = {http://grass.osgeo.org},
+#  url = {https://grass.osgeo.org},
 # }
 
 

src/general/g.compare.md5/g.compare.md5.html

@@ -29,4 +29,4 @@ <h2>AUTHOR</h2>
 
 Luca Delucchi, Fondazione Edmund Mach, Research and Innovation Centre,
 Department of Biodiversity and Molecular Ecology,
-<a href="http://gis.cri.fmach.it">GIS and Remote Sensing Unit</a>, Italy
+<a href="https://web.archive.org/web/20151217025426/https://gis.cri.fmach.it/">GIS and Remote Sensing Unit</a>, Italy

src/general/g.download.location/g.download.location.html

@@ -22,4 +22,4 @@ <h2>SEE ALSO</h2>
 
 <h2>AUTHOR</h2>
 
-Vaclav Petras, <a href="http://geospatial.ncsu.edu/osgeorel/">NCSU GeoForAll Lab</a>
+Vaclav Petras, <a href="https://geospatial.ncsu.edu/geoforall/">NCSU GeoForAll Lab</a>

src/general/g.isis3mt/g.isis3mt.html

@@ -5,9 +5,9 @@ <h2>DESCRIPTION</h2>
 
 <h2>NOTE</h2>
 
-The ISIS3 user should use  matchmap=yes in cam2map
+The ISIS3 user should use <tt>matchmap=yes</tt> in <tt>cam2mapi</tt>.
 
 <h2>AUTHORS</h2>
 
-Alessandro Frigeri, INA, Ispra, Italy
+Alessandro Frigeri, INA, Ispra, Italy<br>
 Added to GRASS 7 by Yann Chemin

src/general/g.proj.all/g.proj.all.html

@@ -24,5 +24,5 @@ <h2>SEE ALSO</h2>
 
 <h2>AUTHORS</h2>
 
-Anna Petrasova, <a href="http://gis.ncsu.edu/osgeorel/">NCSU OSGeoREL</a>,<br>
-Vaclav Petras, <a href="http://gis.ncsu.edu/osgeorel/">NCSU OSGeoREL</a>
+Anna Petrasova, <a href="https://geospatial.ncsu.edu/geoforall/">NCSU GeoForAll Lab</a>,<br>
+Vaclav Petras, <a href="https://geospatial.ncsu.edu/geoforall/">NCSU GeoForAll Lab</a>

src/general/g.proj.identify/g.proj.identify.html

@@ -22,14 +22,14 @@ <h2>SEE ALSO</h2>
 
 <em>
 <a href="https://grass.osgeo.org/grass-stable/manuals/g.proj.html">g.proj</a>,
-<a href="m.proj.html">m.proj</a>,
+<a href="https://grass.osgeo.org/grass-stable/manuals/m.proj.html">m.proj</a>,
 <a href="https://grass.osgeo.org/grass-stable/manuals/r.proj.html">r.proj</a>,
 <a href="https://grass.osgeo.org/grass-stable/manuals/v.proj.html">v.proj</a>
 </em>
 
 <h2>AUTHORS</h2>
 
-Matej Krejci, <a href="http://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
+Matej Krejci, <a href="https://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
 at the Czech Technical University in Prague, developed
-during <a href="http://trac.osgeo.org/grass/wiki/GSoC/2014/MetadataForGRASS">Google
-Summer of Code 2015</a> (mentors: Martin Landa)
+during <a href="https://trac.osgeo.org/grass/wiki/GSoC/2014/MetadataForGRASS">Google
+Summer of Code 2015</a> (mentor: Martin Landa)

src/general/g.rename.many/g.rename.many.html

@@ -22,7 +22,7 @@ <h2>DESCRIPTION</h2>
         </li>
         <li>
             preparation of a
-            <a href="http://grasswiki.osgeo.org/wiki/GRASS_GIS_Standardized_Sample_Datasets">
+            <a href="https://grasswiki.osgeo.org/wiki/GRASS_GIS_Standardized_Sample_Datasets">
             GRASS GIS Standardized Sample Dataset</a> which requires
             a certain set of standardized names
         </li>
@@ -93,4 +93,4 @@ <h2>SEE ALSO</h2>
 
 <h2>AUTHOR</h2>
 
-Vaclav Petras, <a href="http://geospatial.ncsu.edu/osgeorel/">NCSU OSGeoREL</a>
+Vaclav Petras, <a href="https://geospatial.ncsu.edu/osgeorel/">NCSU OSGeoREL</a>

src/gui/wxpython/wx.metadata/config/default-sample.cfg

@@ -58,7 +58,7 @@ identification_keywords_type=theme
 identification_fees=None
 identification_accessconstraints=None
 provider_name=Organization Name
-provider_url=http://pycsw.org/
+provider_url=https://pycsw.org/
 contact_name=Lastname, Firstname
 contact_position=Position Title
 contact_address=Mailing Address
@@ -83,7 +83,7 @@ database=sqlite:////var/www/pycsw/tests/suites/cite/data/records.db
 #database=mysql://username:password@localhost/pycsw?charset=utf8
 #mappings=path/to/mappings.py
 table=records
-#filter=type = 'http://purl.org/dc/dcmitype/Dataset'
+#filter=type = 'https://purl.org/dc/dcmitype/Dataset'
 
 [metadata:inspire]
 enabled=true

src/gui/wxpython/wx.metadata/db.csw.admin/db.csw.admin.html

@@ -28,7 +28,7 @@ <h3>Configure file</h3>
 
 
 <div class="code"><pre>
-db.csw.harvest source=http://geodati.gov.it/RNDT/csw destination=http://localhost:8000/
+db.csw.harvest source=https://geodati.gov.it/RNDT/csw destination=http://localhost:8000/
 </pre>
 </div>
 
@@ -47,7 +47,7 @@ <h2>SEE ALSO</h2>
     See also related <a href="https://grasswiki.osgeo.org/wiki/ISO/INSPIRE_Metadata_Support">wiki page</a>.
 
 <h2>AUTHOR</h2>
-Matej Krejci, <a href="http://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
+Matej Krejci, <a href="https://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
 at the Czech Technical University in Prague, developed
 during <a href="https://trac.osgeo.org/grass/wiki/GSoC/2014/MetadataForGRASS">Google
     Summer of Code 2015</a> (mentors: Martin Landa)

src/gui/wxpython/wx.metadata/db.csw.harvest/db.csw.harvest.html

@@ -14,7 +14,7 @@ <h2>EXAMPLES</h2>
 Harvesting of a remote catalogue to local:
 
 <div class="code"><pre>
-db.csw.harvest source=http://geodati.gov.it/RNDT/csw destination=http://localhost:8000/
+db.csw.harvest source=https://geodati.gov.it/RNDT/csw destination=http://localhost:8000/
 </pre></div>
 
 <h2>SEE ALSO</h2>
@@ -32,7 +32,7 @@ <h2>SEE ALSO</h2>
     See also related <a href="https://grasswiki.osgeo.org/wiki/ISO/INSPIRE_Metadata_Support">wiki page</a>.
 
 <h2>AUTHOR</h2>
-Matej Krejci, <a href="http://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
+Matej Krejci, <a href="https://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
 at the Czech Technical University in Prague, developed
 during <a href="https://trac.osgeo.org/grass/wiki/GSoC/2014/MetadataForGRASS">Google
     Summer of Code 2015</a> (mentors: Martin Landa)

src/gui/wxpython/wx.metadata/db.csw.harvest/db.csw.harvest.py

@@ -94,7 +94,9 @@ def harvest(source, dst):
                 sys.argv[1],
                 i,
             )
-            dest.harvest(source=source, resourcetype="http://www.isotc211.org/2005/gmd")
+            dest.harvest(
+                source=source, resourcetype="https://www.isotc211.org/2005/gmd"
+            )
             # print dest.request
             # print dest.response
 

src/gui/wxpython/wx.metadata/db.csw.run/db.csw.run.html

@@ -1,8 +1,11 @@
 <h2>DESCRIPTION</h2>
 
-...
+<b>db.csw.run</b> is designed to interact with Catalog Service for the Web (CSW)
+servers for metadata management purposes. It is implemented as a WSGI wrapper
+for pycsw and the module for starting the server on localhost.
 
 <h2>NOTES</h2>
+
 ...
 
 <h2>SEE ALSO</h2>
@@ -17,12 +20,12 @@ <h2>SEE ALSO</h2>
 </em>
 
 <p>
-    See also related <a href="http://grasswiki.osgeo.org/wiki/ISO/INSPIRE_Metadata_Support">wiki page</a>.
+See also related <a href="https://grasswiki.osgeo.org/wiki/ISO/INSPIRE_Metadata_Support">wiki page</a>.
 
 
 <h2>AUTHORS</h2>
 
-Matej Krejci, <a href="http://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
+Matej Krejci, <a href="https://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
 at the Czech Technical University in Prague, developed
-during <a href="http://trac.osgeo.org/grass/wiki/GSoC/2014/MetadataForGRASS">Google
+during <a href="https://trac.osgeo.org/grass/wiki/GSoC/2014/MetadataForGRASS">Google
     Summer of Code 2014</a> (mentors: Margherita Di Leo, Martin Landa)