Skip to content

Commit

Permalink
Merge branch 'main' into markdown_docs
Browse files Browse the repository at this point in the history
  • Loading branch information
landam authored Oct 26, 2024
2 parents 2e5454c + 5af22b2 commit 1a77853
Show file tree
Hide file tree
Showing 256 changed files with 690 additions and 1,158 deletions.
4 changes: 1 addition & 3 deletions .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ per-file-ignores =
gui/scripts/d.wms.py: E501
gui/wxpython/image2target/g.gui.image2target.py: E501
gui/wxpython/nviz/*: E722
gui/wxpython/photo2image/*: F841, E722, E265
gui/wxpython/photo2image/g.gui.photo2image.py: E501, F841
gui/wxpython/photo2image/g.gui.photo2image.py: E501
gui/wxpython/psmap/*: E501, E722
gui/wxpython/vdigit/*: F841, E722, F405, F403
gui/wxpython/animation/g.gui.animation.py: E501
Expand Down Expand Up @@ -103,7 +102,6 @@ per-file-ignores =
scripts/db.univar/db.univar.py: E501
scripts/d.frame/d.frame.py: E722
scripts/i.pansharpen/i.pansharpen.py: E722, E501
scripts/r.fillnulls/r.fillnulls.py: E722
scripts/v.what.strds/v.what.strds.py: E501
# Line too long (esp. module interface definitions)
scripts/*/*.py: E501
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/additional_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,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: '3.10'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- name: Checkout repository
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: '3.x'
- name: Install non-Python dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create_release_draft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
ref: ${{ github.ref }}
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
with:
python-version: '3.11'
- name: Create output directory
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- 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: ${{ matrix.python-version }}
cache: pip
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
# renovate: datasource=pypi depName=bandit
BANDIT_VERSION: "1.7.10"
# renovate: datasource=pypi depName=ruff
RUFF_VERSION: "0.7.0"
RUFF_VERSION: "0.7.1"

runs-on: ${{ matrix.os }}
permissions:
Expand All @@ -57,7 +57,7 @@ jobs:
- 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 }}
cache: pip
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ repos:
)
- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.7.0
rev: v0.7.1
hooks:
# Run the linter.
- id: ruff
Expand Down
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ MS-Windows/Cygwin: Huidae Cho <grass4u gmail com>
Source code Quality assessment system
- SOCCER Labs at Ecole Polytechnique de Montreal, Canada
http://web.soccerlab.polymtl.ca/grass-evolution/grass-browsers/grass-index-en.html
http://lists.osgeo.org/mailman/listinfo/grass-qa
https://lists.osgeo.org/mailman/listinfo/grass-qa


GRASS 5.7/6.0: Primary authors of new source code
Expand Down
4 changes: 2 additions & 2 deletions REQUIREMENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Note: also the respective development packages (commonly named `xxx-dev` or
[https://facebook.github.io/zstd](https://facebook.github.io/zstd)
- **FFTW 2.x or 3.x** (library for computing the Discrete Fourier Transform),
required for `i.fft` and `i.ifft` and other modules
[http://www.fftw.org](http://www.fftw.org)
[https://fftw.org](https://fftw.org)
- **GEOS** (Geometry Engine library),
needed for `v.buffer` and adds extended options to the `v.select` module
[https://libgeos.org/](https://libgeos.org/)
Expand Down Expand Up @@ -83,7 +83,7 @@ Note: also the respective development packages (commonly named `xxx-dev` or
- **SQLite libraries** (for the SQLite database interface)
[https://www.sqlite.org](https://www.sqlite.org)
- **unixODBC** (for the ODBC database interface)
[http://www.unixodbc.org](http://www.unixodbc.org)
[https://www.unixodbc.org](https://www.unixodbc.org)
- **R Statistics** (for the R statistical language interface)
[https://cran.r-project.org](https://cran.r-project.org)
- **FreeType2** (for TrueType font support and `d.text.freetype`)
Expand Down
4 changes: 2 additions & 2 deletions TODO
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ Imagery
-----------------
See also

http://trac.osgeo.org/grass/wiki/Grass7Planning
https://trac.osgeo.org/grass/wiki/Grass7Planning

http://trac.osgeo.org/grass/wiki/Grass8Planning
https://trac.osgeo.org/grass/wiki/Grass8Planning
2 changes: 1 addition & 1 deletion binaryInstall.src
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ if [ $? -eq 0 ] ; then
IFS="$IFSSAVE"
if [ ! "$GUNZIP" ] ; then
echo "No gunzip installed. Please get from:"
echo " http://www.gnu.org/software/gzip/gzip.html"
echo " https://www.gnu.org/software/gzip/gzip.html"
exit
fi
else
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# Public License (>=v2). Read the file COPYING that
# comes with GRASS for details.
#
# MANUAL: http://www.gnu.org/software/autoconf/manual/autoconf.html
# MANUAL: https://www.gnu.org/software/autoconf/manual/autoconf.html
# http://savannah.gnu.org/projects/autoconf/
# Website for config.guess, config.sub:
# wget http://git.savannah.gnu.org/cgit/config.git/plain/config.guess
Expand Down
2 changes: 1 addition & 1 deletion db/drivers/mysql/grass-mesql.html
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ <h2>AUTHOR</h2>

<p>
Credits: Development of the driver was sponsored by
<a href="http://www.faunalia.it">Faunalia</a> (Italy)
<a href="https://www.faunalia.it">Faunalia</a> (Italy)
as part of a project for <a href="http://www.atac.roma.it/">ATAC</a>.


Expand Down
2 changes: 1 addition & 1 deletion db/drivers/mysql/grass-mysql.html
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ <h2>SEE ALSO</h2>
<h2>Credits</h2>

Development of the driver was sponsored by
<a href="http://www.faunalia.it">Faunalia</a> (Italy)
<a href="https://www.faunalia.it">Faunalia</a> (Italy)
as part of a project for <a href="http://www.atac.roma.it/">ATAC</a>.

<h2>AUTHOR</h2>
Expand Down
2 changes: 1 addition & 1 deletion db/drivers/odbc/INSTALL
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1. Download, compile, install and configure ODBC (http://www.unixodbc.org/)
1. Download, compile, install and configure ODBC (https://www.unixodbc.org/)
2. Copy ODBC include files to /usr/include/odbc
3. Compile src/libes/dbmi/drivers/odbc
4. Add row for ODBC driver to dbmscap file
6 changes: 3 additions & 3 deletions db/drivers/odbc/grass-odbc.html
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@ <h4>Linux</h4>
&nbsp;ConnSettings&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; =</pre></div>

Configuration of an DSN without GUI is described on
<a href="http://www.unixodbc.org/odbcinst.html">http://www.unixodbc.org/odbcinst.html</a>,
<a href="https://www.unixodbc.org/odbcinst.html">https://www.unixodbc.org/odbcinst.html</a>,
but odbc.ini and .odbc.ini may be created by the 'ODBCConfig' tool. You can
easily view your DSN structure by 'DataManager'. Configuration with
GUI is described on <a href="http://www.unixodbc.org/doc/UserManual/">http://www.unixodbc.org/doc/UserManual/</a>
GUI is described on <a href="https://www.unixodbc.org/doc/UserManual/">https://www.unixodbc.org/doc/UserManual/</a>
<p>
To find out about your PostgreSQL protocol, run:<br>
<div class="code"><pre>
Expand Down Expand Up @@ -159,6 +159,6 @@ <h2>SEE ALSO</h2>
<em>
<a href="db.connect.html">db.connect</a>,
<a href="v.db.connect.html">v.db.connect</a>,
<a href="http://www.unixODBC.org">unixODBC web site</a>,
<a href="https://www.unixodbc.org">unixODBC web site</a>,
<a href="sql.html">SQL support in GRASS GIS</a>
</em>
2 changes: 1 addition & 1 deletion db/drivers/postgres/README
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Check also for PostgreSQL data types for defining them in GRASS:


Supported types in ./globals.h:
(See http://www.postgresql.org/docs/9.4/interactive/datatype.html)
(See https://www.postgresql.org/docs/9.4/interactive/datatype.html)

DB_C_TYPE_INT:
bit, int2, smallint, int4, int, integer, int8, bigint, serial, oid
Expand Down
10 changes: 5 additions & 5 deletions db/drivers/postgres/grass-pg.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<h2>Creating a PostgreSQL database</h2>

A new database is created with <tt>createdb</tt>, see
the <a href="http://www.postgresql.org/docs/manuals/">PostgreSQL
the <a href="https://www.postgresql.org/docs/manuals/">PostgreSQL
manual</a> for details.

<h2>Connecting GRASS to PostgreSQL</h2>
Expand Down Expand Up @@ -120,7 +120,7 @@ <h4>Geometry Converters</h4>
<li><a href="http://e00pg.sourceforge.net/">e00pg</a>: E00 to PostGIS filter,
see also <em><a href="v.in.e00.html">v.in.e00</a></em>.
</li>
<li>GDAL/OGR <a href="http://www.gdal.org/">ogrinfo and ogr2ogr</a>:
<li>GDAL/OGR <a href="https://gdal.org/">ogrinfo and ogr2ogr</a>:
GIS vector format converter and library, e.g. ArcInfo or SHAPE to PostGIS.<br>
<tt>ogr2ogr -f "PostgreSQL" shapefile ??</tt>
</li>
Expand All @@ -141,8 +141,8 @@ <h2>SEE ALSO</h2>
<h2>REFERENCES</h2>

<ul>
<li><a href="http://www.postgresql.org/">PostgreSQL web site</a></li>
<li><a href="http://www.pgadmin.org/">pgAdmin graphical user interface</a></li>
<li><a href="http://www.gdal.org/drv_pg.html">GDAL/OGR PostgreSQL
<li><a href="https://www.postgresql.org/">PostgreSQL web site</a></li>
<li><a href="https://www.pgadmin.org/">pgAdmin graphical user interface</a></li>
<li><a href="https://gdal.org/drv_pg.html">GDAL/OGR PostgreSQL
driver documentation</a></li>
</ul>
2 changes: 1 addition & 1 deletion db/drivers/sqlite/README
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ db.connect driver=sqlite \
The database is created automatically when used first time.
That is SQLite feature followed also in the driver.

SQLite uses "type affinity", (http://www.sqlite.org/datatype3.html)
SQLite uses "type affinity", (https://www.sqlite.org/datatype3.html)
that means column types are recommended, but not required.

If the driver in GRASS has to determine column type, it first reads
Expand Down
2 changes: 1 addition & 1 deletion db/drivers/sqlite/fetch.c
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ int db__driver_fetch(dbCursor *cn, int position, int *more)
G_debug(3, "col %d, litetype %d, sqltype %d: val = '%s'", col, litetype,
sqltype, text);

/* http://www.sqlite.org/capi3ref.html#sqlite3_column_type
/* https://www.sqlite.org/capi3ref.html#sqlite3_column_type
SQLITE_INTEGER 1
SQLITE_FLOAT 2
SQLITE_TEXT 3
Expand Down
12 changes: 6 additions & 6 deletions db/drivers/sqlite/grass-sqlite.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ <h2>Supported SQL commands</h2>

All SQL commands supported by SQLite (for limitations, see
SQLite help page:
<a href="http://www.sqlite.org/lang.html">SQL As Understood By SQLite</a> and
<a href="http://www.sqlite.org/omitted.html">Unsupported SQL</a>).
<a href="https://www.sqlite.org/lang.html">SQL As Understood By SQLite</a> and
<a href="https://www.sqlite.org/omitted.html">Unsupported SQL</a>).

<h2>Operators available in conditions</h2>

Expand All @@ -46,7 +46,7 @@ <h2>Browsing table data in DB</h2>
</pre></div>

<!-- doesn't work yet, why?:
ah, pending patch: http://www.sqlite.org/cvstrac/tktview?tn=1476
ah, pending patch: https://www.sqlite.org/cvstrac/tktview?tn=1476
<h2>Adding an unique ID column</h2>
Expand All @@ -72,7 +72,7 @@ <h2>SEE ALSO</h2>
<br><br>
<a href="sql.html">SQL support in GRASS GIS</a>
<br><br>
<a href="http://www.sqlite.org">SQLite web site</a>,
<a href="http://www.sqlite.org/quickstart.html">SQLite manual</a>,
<a href="http://www.sqlite.org/cvstrac/wiki?p=ManagementTools">sqlite - Management Tools</a>
<a href="https://www.sqlite.org">SQLite web site</a>,
<a href="https://www.sqlite.org/quickstart.html">SQLite manual</a>,
<a href="https://www.sqlite.org/cvstrac/wiki?p=ManagementTools">sqlite - Management Tools</a>
</em>
2 changes: 1 addition & 1 deletion doc/debugging.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ C Code debugging Software:
ddd `which r.plane`
RUN -> here enter Parameters/Flags

http://www.gnu.org/software/ddd/
https://www.gnu.org/software/ddd/
(GNU DDD is a graphical front-end for command-line debuggers such as
GDB, DBX, WDB, Ladebug, JDB, XDB, the Perl debugger, the bash debugger, or the
Python debugger. )
Expand Down
2 changes: 1 addition & 1 deletion doc/development/rfc/PSC_guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Author: [GRASS PSC](https://trac.osgeo.org/grass/wiki/PSC)

Contact: [grass-psc AT lists.osgeo.org](http://lists.osgeo.org/mailman/listinfo/grass-psc)
Contact: [grass-psc AT lists.osgeo.org](https://lists.osgeo.org/mailman/listinfo/grass-psc)

Status: Adopted (6 April 2007)

Expand Down
6 changes: 3 additions & 3 deletions doc/development/rfc/PSC_voting_procedures.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

Author: [GRASS PSC](https://trac.osgeo.org/grass/wiki/PSC)

Contact: [grass-psc AT lists.osgeo.org](http://lists.osgeo.org/mailman/listinfo/grass-psc)
Contact: [grass-psc AT lists.osgeo.org](https://lists.osgeo.org/mailman/listinfo/grass-psc)

Status: Adopted (6 Oct 2014)

## Introduction

In brief, the PSC members vote on proposals on the dedicated
[GRASS-PSC mailing list](http://lists.osgeo.org/mailman/listinfo/grass-psc).
[GRASS-PSC mailing list](https://lists.osgeo.org/mailman/listinfo/grass-psc).
Proposals are available for review for at least seven calendar days, and a
single veto is sufficient to delay progress although ultimately a majority
of committee members can pass a proposal.
Expand Down Expand Up @@ -37,7 +37,7 @@ Voting:

1. A voting procedure is started by the proposer. For a more visible communication,
the word [MOTION] should be put into the subject of the email to the
[GRASS-PSC mailing list](http://lists.osgeo.org/mailman/listinfo/grass-psc)
[GRASS-PSC mailing list](https://lists.osgeo.org/mailman/listinfo/grass-psc)
along with a short title.
2. Respondents may vote "+1" to indicate support for the proposal and a
willingness to support implementation.
Expand Down
2 changes: 1 addition & 1 deletion doc/development/rfc/legal_aspects_of_code_contributions.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Author: Markus Neteler (based on GDAL.org/RFC3)

Contact: [grass-psc AT lists.osgeo.org](http://lists.osgeo.org/mailman/listinfo/grass-psc)
Contact: [grass-psc AT lists.osgeo.org](https://lists.osgeo.org/mailman/listinfo/grass-psc)

Status: Adopted (8 Dec 2006)

Expand Down
4 changes: 2 additions & 2 deletions doc/development/style_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

### Python

We follow the [PEP8](http://www.python.org/dev/peps/pep-0008/) style guide for
Python. Docstrings follow [PEP257](http://www.python.org/dev/peps/pep-0257/) and
We follow the [PEP8](https://www.python.org/dev/peps/pep-0008/) style guide for
Python. Docstrings follow [PEP257](https://www.python.org/dev/peps/pep-0257/) and
use
[Sphinx style](https://sphinx-rtd-tutorial.readthedocs.io/en/latest/docstrings.html).

Expand Down
2 changes: 1 addition & 1 deletion doc/gui/wxpython/example/g.gui.example.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@ <h2>SEE ALSO</h2>
<h2>AUTHOR</h2>

Anna Kratochvilova,
<a href="http://www.cvut.cz">Czech Technical University in Prague</a>, Czech Republic
<a href="https://www.cvut.cz">Czech Technical University in Prague</a>, Czech Republic
10 changes: 5 additions & 5 deletions doc/vector/TODO
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ the necessity to calculate always the box on the fly (when it is not
stored in the structure) which can be time consuming for example for
areas or long lines.

* See also http://trac.osgeo.org/grass/ticket/542
* See also https://trac.osgeo.org/grass/ticket/542
* Update: implemented in r46898 (2011/07) by Markus Metz

Switching to update mode
Expand Down Expand Up @@ -143,7 +143,7 @@ display a shapefile or PostGIS layers directly:
d.vect map=PG:dbname=test@OGR layer=roads # display table roads from database test

* Update: in progress,
see http://trac.osgeo.org/grass/wiki/Grass7/VectorLib/OGRInterface#DirectOGRreadaccess
see https://trac.osgeo.org/grass/wiki/Grass7/VectorLib/OGRInterface#DirectOGRreadaccess

Simple feature API and sequential reading
-----------------------------------------
Expand Down Expand Up @@ -249,10 +249,10 @@ probably better to use copy of 'coor' file and attributes written to
SQLite database.

Update: see
http://trac.osgeo.org/grass/browser/grass-addons/grass7/vector/v.pack
https://trac.osgeo.org/grass/browser/grass-addons/grass7/vector/v.pack
and
http://trac.osgeo.org/grass/browser/grass-addons/grass7/vector/v.unpack
https://trac.osgeo.org/grass/browser/grass-addons/grass7/vector/v.unpack
by Luca Delucchi

1/2009: Other suggestions moved to
http://trac.osgeo.org/grass/
https://trac.osgeo.org/grass/
2 changes: 1 addition & 1 deletion general/g.list/g.list.html
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ <h2>SEE ALSO</h2>
<a href="t.vect.list.html">t.vect.list</a>
</em>
<p>
<a href="http://en.wikipedia.org/wiki/Regular_expression">Regular expressions</a>
<a href="https://en.wikipedia.org/wiki/Regular_expression">Regular expressions</a>
(aka regex) - from Wikipedia, the free encyclopedia

<h2>AUTHOR</h2>
Expand Down
4 changes: 2 additions & 2 deletions general/g.version/g.version.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ <h2>NOTES</h2>

<p>
Version numbers of additional libraries
like <a href="https://proj.org/">PROJ</a>, <a href="http://gdal.org/">GDAL/OGR</a>
or <a href="http://trac.osgeo.org/geos">GEOS</a> are printed
like <a href="https://proj.org/">PROJ</a>, <a href="https://gdal.org/">GDAL/OGR</a>
or <a href="https://trac.osgeo.org/geos">GEOS</a> are printed
by <b>-e</b> flag.

<p>
Expand Down
Loading

0 comments on commit 1a77853

Please sign in to comment.