Skip to content

Commit cdd84c1

Browse files
authored
Fix trailing whitespace, EOF and file formatting (#2785)
Updates .pre-commit-config.yaml file with list of files/directories to exclude. Following pre-commit hooks are applied: * trailing-whitespace * end-of-file-fixer * clang-format (now also formatting JavaScript, JSON and Objective-C files) * markdownlint
1 parent d0a9538 commit cdd84c1

File tree

980 files changed

+7764
-8107
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

980 files changed

+7764
-8107
lines changed

.pre-commit-config.yaml

+28
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,35 @@ repos:
44
rev: v4.4.0
55
hooks:
66
- id: trailing-whitespace
7+
exclude: |
8+
(?x)^(
9+
configure$|
10+
.*\.ascii$|
11+
.*\.asc$|
12+
.*\.ref$|
13+
raster3d/r3.null/testsuite/data/test_volume_.*|
14+
mswindows/.*|
15+
.*\.po$|
16+
.*\.ps$|
17+
.*\.svg$|
18+
python/libgrass_interface_generator/ctypesgen/|
19+
lib/fonts/fonts/.*
20+
)
721
- id: end-of-file-fixer
22+
exclude: |
23+
(?x)^(
24+
configure$|
25+
.*\.ascii$|
26+
.*\.asc$|
27+
.*\.ref$|
28+
python/grass/pygrass/raster/testsuite/data/geology_cats|
29+
mswindows/.*|
30+
.*\.po$|
31+
.*\.ps$|
32+
.*\.svg$|
33+
python/libgrass_interface_generator/ctypesgen/|
34+
lib/fonts/fonts/.*
35+
)
836
- repo: https://github.com/igorshubovych/markdownlint-cli
937
rev: v0.33.0
1038
hooks:

.travis/linux.before_install.sh

-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@ set -e
66
# build dependencies
77
sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable -y
88
sudo apt-get update -qq
9-

.travis/linux.install.sh

-1
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,3 @@ sudo apt-get install --no-install-recommends \
5252
pdal \
5353
proj-bin \
5454
proj-data
55-

AUTHORS

+19-19
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ DOCUMENTATION
152152

153153
GUI
154154
- Radim Blazek <blazek itc it>: primary author of d.m and v.digit
155-
- Michael Barton <michael.barton asu edu>: tcltkgrass menu system
155+
- Michael Barton <michael.barton asu edu>: tcltkgrass menu system
156156
partial rewrite and integration into d.m
157157
- Multibyte FreeType Font Support: www.FOSS4G.org team
158158

@@ -168,7 +168,7 @@ INTERNATIONALIZATION
168168
- Arabic: Dr. Alaa Masoud
169169
- Chinese: Zhang Jun
170170
- Czech: Martin Landa, Jachym Cepicky, Michal Bil, Radim Blazek
171-
- German: Stephan Holl
171+
- German: Stephan Holl
172172
- French: Emmanuel Saracco, Daniel Calvelo, Laurent Courty
173173
- Italian: Maurizio Napolitano, Luciano Montanaro, Lorenzo Moretti
174174
- Japanese: Susumu Nonogaki
@@ -221,7 +221,7 @@ VECTOR
221221
- Radim Blazek <blazek itc it>: vector engine core developer
222222
- David D Gray: vector engine contributions
223223
- modules: see individual authors and ./contributors.csv
224-
224+
225225
DBMI
226226
- based on original code from GRASS 5.0 (developer unknown, CERL?)
227227
- Radim Blazek <blazek itc it>: core developer of 5.7 enhancements
@@ -233,7 +233,7 @@ DGLib: vector networking
233233
network analysis
234234

235235
FORMS library
236-
- Radim Blazek <blazek itc it>: core developer
236+
- Radim Blazek <blazek itc it>: core developer
237237

238238
RASTER
239239
- Modules: see 5.4 authors below + individual modules
@@ -273,8 +273,8 @@ GRASS GIS 5.4 Author List
273273
Please check additionally the GRASS 1.x-5.0 credits list at:
274274
https://grass.osgeo.org/about/credits/
275275

276-
While it is impossible for us to give credit to everyone (past
277-
and present) who has contributed to GRASS, the following is the
276+
While it is impossible for us to give credit to everyone (past
277+
and present) who has contributed to GRASS, the following is the
278278
incomplete official list for GRASS 5.0-5.4:
279279

280280
Institutions:
@@ -285,31 +285,31 @@ Institutions:
285285

286286
GRASS 5 Core Team (most have CVS write access):
287287
Michael Barton <michael.barton asu edu> (tcltkgrass menus)
288-
Roger Bivand <Roger.Bivand nhh.no> ("R" statistical language
288+
Roger Bivand <Roger.Bivand nhh.no> ("R" statistical language
289289
support)
290290
Radim Blazek <blazek itc.it> (DBMS support, ps.map, d.dm)
291291
Hamish Bowman <hamish.bowman otago.ac.nz> (ps.map,display,rasters, ...)
292292
Huidae Cho <grass4u gmail.com> (FreeType,r.topmodel,r.topidx, ..)
293293
Glynn Clements <glynn gclements.plus.com> (Code portability, ...)
294-
Bob Covill <bcovill tekmap.ns.ca> (NVIZ export formats,
294+
Bob Covill <bcovill tekmap.ns.ca> (NVIZ export formats,
295295
r.in|out.bin)
296296
Jaro Hofierka <hofierka geomodel.sk> (NVIZ port, grid3D and related)
297297
Paul Kelly <paul-grass stjohnspoint.co.uk> (PROJ4, datum trafo, IRIX ...)
298298
Lubos Mitas <lmitas ncsa.uiuc.edu> (multivariate spline
299-
interpolation (RST)
299+
interpolation (RST)
300300
and erosion modeling)
301301
Helena Mitasova <hmitaso unity.ncsu.edu> (interpolation modules, NVIZ,
302302
RASTER3D, erosion modelling)
303-
Eric G. Miller <egm2 jps.net> (sites format, new autoconf
303+
Eric G. Miller <egm2 jps.net> (sites format, new autoconf
304304
system, bugfixes etc.)
305305
Roger S. Miller <rgrmill rt66.com> (raster modules, r.drain etc.)
306306
Markus Neteler <neteler itc.it> (GRASS 5 coordination, this&that ...)
307307
Bernhard Reiter <bernhard intevation.de> (License, CVS, Bugfixes, RT)
308308
Alexander Shevlakov <sixote yahoo.com> (PostgreSQL/GRASS interface)
309309
Mike Thomas <miketh brisbane.paradigmgeo.com> (generic Windows driver)
310-
Jan-Oliver Wagner <jan intevation.de> (XML-support,
310+
Jan-Oliver Wagner <jan intevation.de> (XML-support,
311311
Module descriptions)
312-
Frank Warmerdam <warmerdam pobox.com> (GDAL, SHAPE implementation,
312+
Frank Warmerdam <warmerdam pobox.com> (GDAL, SHAPE implementation,
313313
new GRASS I/O library)
314314
Michel Wurtz <mw teledetection.fr> (ESRI E00 support)
315315

@@ -320,11 +320,11 @@ Former programmers (GRASS 5.0):
320320
Malcolm Blue <mblue nb.sympatico.ca> (Windows NT/Cygnus port)
321321
Jacques Bouchard <bouchard onera.fr> (tcltkgrass, bugfixes)
322322
David D. Gray <ddgray armadce.demon.co.uk>(Vector, SQL support)
323-
Justin Hickey <jhickey hpcc.nectec.or.th> (GRASS initialization,
323+
Justin Hickey <jhickey hpcc.nectec.or.th> (GRASS initialization,
324324
new env var handling, SGI)
325325
John Huddleston <jhudd lamar.colostate.edu> (Windows NT/Cygnus port)
326326
Bill Hughes <bhughes grasshoppernet.com> (64bit compliance)
327-
Andreas Lange <Andreas.Lange Rhein-Main.de> (SGI/Irix compliance,
327+
Andreas Lange <Andreas.Lange Rhein-Main.de> (SGI/Irix compliance,
328328
Proj/Datum support)
329329
Brook Milligan <brook trillium.NMSU.Edu> (initial autoconf implementation)
330330
Phisan Santitamnont <fsvpss eng.chula.ac.th> (initial Linux compilation
@@ -364,12 +364,12 @@ Former GRASS 4 development (1984 to 1995):
364364
Former Institutions
365365
- University of Illinois at Urbana-Champaign, USA
366366
Helena Mitasova <hmitaso unity.ncsu.edu> (interpolation modules, NVIZ, RASTER3D)
367-
William Brown <brown gis.uiuc.edu> (libraries, interpolation modules,
367+
William Brown <brown gis.uiuc.edu> (libraries, interpolation modules,
368368
NVIZ, RASTER3D)
369369

370370
- National Center for Supercomputing Applications, USA
371371
Lubos Mitas (multivariate spline interpolation (RST) and erosion modeling)
372-
372+
373373
- High Performance Computing Center, Thailand
374374
National Electronics and Computer Technology Center
375375
Bangkok, Thailand
@@ -386,9 +386,9 @@ development team, listed below, as many are still active in the
386386
project and GRASS GIS owes much of itself to the generosity of their
387387
bright minds.
388388

389-
GRASS 6.0 was made up of entirely new code for much of the vector and
390-
database management subsystems. The raster, display, and projection
391-
subsystems are largely directly inherited from GRASS 5.4 without change.
389+
GRASS 6.0 was made up of entirely new code for much of the vector and
390+
database management subsystems. The raster, display, and projection
391+
subsystems are largely directly inherited from GRASS 5.4 without change.
392392
The core GIS, GUI, and build subsystems are a hybrid of old and new code.
393393

394394

COPYING

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ GRASS Development Team at the following address:
3232
GRASS Development Team
3333
c/o Markus Neteler
3434
mundialis GmbH & Co. KG
35-
Kölnstrasse 99
35+
Kölnstrasse 99
3636
53111 Bonn, Germany
3737
neteler AT osgeo.org
3838

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ libs:
106106
$(MAKE) subdirs SUBDIRS=$(LIBDIRS)
107107
$(MAKE) $(FILES_DST)
108108

109-
cleandistdirs:
109+
cleandistdirs:
110110
-rm -rf $(ARCH_DISTDIR)
111111
-rm -rf $(ARCH_BINDIR)
112112

REQUIREMENTS.md

+63-53
Original file line numberDiff line numberDiff line change
@@ -17,119 +17,129 @@ To enable and disable features please read the [INSTALL.md](INSTALL.md) file.
1717
Most tools are standard tools on GNU/Linux,
1818
for other platforms you may have to install some of them.
1919

20-
- **C-compiler** (cc, gcc, egcs, ...)
20+
- **C-compiler** (cc, gcc, egcs, ...)
2121
gcc: [https://www.gnu.org/software/gcc/gcc.html](https://www.gnu.org/software/gcc/gcc.html)
22-
- **GNU make** is recommended (at least version 3.81)
22+
- **GNU make** is recommended (at least version 3.81)
2323
[https://www.gnu.org/software/make/make.html](https://www.gnu.org/software/make/make.html)
24-
- **zlib** compression library (already installed on most modern systems)
25-
It is used to internally compress GRASS raster maps.
24+
- **zlib** compression library (already installed on most modern systems)
25+
It is used to internally compress GRASS raster maps.
2626
libz: [https://www.zlib.net](https://www.zlib.net)
27-
- **flex** lexical analyzer generator (flex)
27+
- **flex** lexical analyzer generator (flex)
2828
_Note: lex is no longer supported, please use flex instead._\
2929
flex: [https://github.com/westes/flex](https://github.com/westes/flex)
30-
- **parser generator** (yacc, bison)
30+
- **parser generator** (yacc, bison)
3131
bison: [https://www.gnu.org/software/bison/bison.html](https://www.gnu.org/software/bison/bison.html)
32-
- **PROJ** - Cartographic Projection Library
32+
- **PROJ** - Cartographic Projection Library
3333
PROJ: [https://proj.org/](https://proj.org/)
34-
- **GDAL/OGR** for import and export of most external raster and vector map formats
34+
- **GDAL/OGR** for import and export of most external raster and vector map formats
3535
GDAL: [https://gdal.org](https://gdal.org)
36-
- **Python >= 3.7** (for temporal framework, scripts, wxGUI, and ctypes interface)
36+
- **Python >= 3.7** (for temporal framework, scripts, wxGUI, and ctypes interface)
3737
[https://www.python.org](https://www.python.org)
3838

3939
## Optional packages
4040

41-
Note: also the respective development packages (commonly named `xxx-dev` or `xxx-devel`) need to be installed.
41+
Note: also the respective development packages (commonly named `xxx-dev` or
42+
`xxx-devel`) need to be installed.
4243

43-
- **C++ Compiler** (required for various C++ GRASS modules)
44+
- **C++ Compiler** (required for various C++ GRASS modules)
4445
gcc: [https://www.gnu.org/software/gcc/gcc.html](https://www.gnu.org/software/gcc/gcc.html)
45-
- **bzip2**, needed for raster compression with bzip2
46+
- **bzip2**, needed for raster compression with bzip2
4647
[https://www.bzip.org](https://www.bzip.org)
47-
- **zstd** (Zstandard), needed for raster compression with zstd
48+
- **zstd** (Zstandard), needed for raster compression with zstd
4849
[https://facebook.github.io/zstd](https://facebook.github.io/zstd)
4950
- **FFTW 2.x or 3.x** (library for computing the Discrete Fourier Transform),
50-
required for `i.fft` and `i.ifft` and other modules
51+
required for `i.fft` and `i.ifft` and other modules
5152
[http://www.fftw.org](http://www.fftw.org)
5253
- **GEOS** (Geometry Engine library),
53-
needed for `v.buffer` and adds extended options to the `v.select` module
54+
needed for `v.buffer` and adds extended options to the `v.select` module
5455
[https://libgeos.org/](https://libgeos.org/)
55-
- **LAPACK / BLAS** (libraries for numerical computing) for GMATH library (GRASS Numerical Library)
56-
[https://www.netlib.org/lapack](https://www.netlib.org/lapack) (usually available on Linux distros)
56+
- **LAPACK / BLAS** (libraries for numerical computing) for GMATH library
57+
(GRASS Numerical Library)
58+
[https://www.netlib.org/lapack](https://www.netlib.org/lapack) (usually
59+
available on Linux distros)
5760
_Note: LAPACK/BLAS support is at time only needed for selected Addons._
58-
- **NetCDF** (for 3D raster netcdf export)
61+
- **NetCDF** (for 3D raster netcdf export)
5962
[https://www.unidata.ucar.edu/software/netcdf/](https://www.unidata.ucar.edu/software/netcdf/)
60-
- **Mesa-3.x**, if hardware OpenGL support is missing in the X Server (OpenGL clone) may be required for wxNVIZ
63+
- **Mesa-3.x**, if hardware OpenGL support is missing in the X Server (OpenGL
64+
clone) may be required for wxNVIZ
6165
[https://mesa3d.org/](https://mesa3d.org/)
62-
- **libpng** (for `r.out.png` and the PNG driver), usually already installed.
66+
- **libpng** (for `r.out.png` and the PNG driver), usually already installed.
6367
[http://www.libpng.org/pub/png/libpng.html](http://www.libpng.org/pub/png/libpng.html)
64-
- **libtiff** (for `r.out.tiff`), usually already installed.
68+
- **libtiff** (for `r.out.tiff`), usually already installed.
6569
[https://gitlab.com/libtiff/libtiff](https://gitlab.com/libtiff/libtiff)
66-
- **readline** for extra command prompt functionality
67-
[https://tiswww.case.edu/~chet/readline/rltop.html](https://tiswww.case.edu/~chet/readline/rltop.html)
70+
- **readline** for extra command prompt functionality
71+
[https://tiswww.case.edu/~chet/readline/rltop.html](https://tiswww.case.edu/~chet/readline/rltop.html)
6872
[ftp://ftp.gnu.org/gnu/readline](ftp://ftp.gnu.org/gnu/readline)
69-
- **PostgreSQL libraries** (for the PostgreSQL database interface and PostGIS support)
73+
- **PostgreSQL libraries** (for the PostgreSQL database interface and PostGIS support)
7074
[https://www.postgresql.org](https://www.postgresql.org)
71-
- **MariaDB/MySQL libraries** (for the MySQL database interface)
75+
- **MariaDB/MySQL libraries** (for the MySQL database interface)
7276
[https://mariadb.org/](https://mariadb.org/)
73-
- **SQLite libraries** (for the SQLite database interface)
77+
- **SQLite libraries** (for the SQLite database interface)
7478
[https://www.sqlite.org](https://www.sqlite.org)
75-
- **unixODBC** (for the ODBC database interface)
79+
- **unixODBC** (for the ODBC database interface)
7680
[http://www.unixodbc.org](http://www.unixodbc.org)
77-
- **R Statistics** (for the R statistical language interface)
81+
- **R Statistics** (for the R statistical language interface)
7882
[https://cran.r-project.org](https://cran.r-project.org)
79-
- **FreeType2** (for TrueType font support and `d.text.freetype`)
83+
- **FreeType2** (for TrueType font support and `d.text.freetype`)
8084
[https://freetype.org/](https://freetype.org/)
81-
- **Ctypes** (for ctypes interface)
85+
- **Ctypes** (for ctypes interface)
8286
Ctypes can be added as a third-party module in Python 2.3 and
83-
2.4 - [https://pypi.org/project/ctypes/1.0.2/](https://pypi.org/project/ctypes/1.0.2/)
87+
2.4 - [https://pypi.org/project/ctypes/1.0.2/](https://pypi.org/project/ctypes/1.0.2/)
8488
[https://docs.python.org/library/ctypes.html](https://docs.python.org/library/ctypes.html)
85-
- **wxPython >= 2.8.10.1** (for wxGUI)
89+
- **wxPython >= 2.8.10.1** (for wxGUI)
8690
[https://www.wxpython.org](https://www.wxpython.org)
87-
- **NumPy >= 1.0.4** (for various wxGUI components and pyGRASS)
91+
- **NumPy >= 1.0.4** (for various wxGUI components and pyGRASS)
8892
[https://numpy.org](https://numpy.org)
89-
- **Python dateutil Library** (`python-dateutil`, needed for the tgrass modules `t.*`)
90-
[https://pypi.org/project/python-dateutil/](https://pypi.org/project/python-dateutil/)
93+
- **Python dateutil Library** (`python-dateutil`, needed for the tgrass modules `t.*`)
94+
[https://pypi.org/project/python-dateutil/](https://pypi.org/project/python-dateutil/)
9195
[https://github.com/dateutil/dateutil](https://github.com/dateutil/dateutil)
92-
- **Python PLY Library (Python Lex-Yacc)** (`python-ply`, needed for the temporal algebra in tgis)
96+
- **Python PLY Library (Python Lex-Yacc)** (`python-ply`, needed for the
97+
temporal algebra in tgis)
9398
[https://www.dabeaz.com/ply](https://www.dabeaz.com/ply/)
94-
- **Pillow (Python Imaging Library)** (highly recommended for wxGUI and necessary for wxGUI Cartographic Composer)
99+
- **Pillow (Python Imaging Library)** (highly recommended for wxGUI and
100+
necessary for wxGUI Cartographic Composer)
95101
[https://python-pillow.org/](https://python-pillow.org/)
96-
- **Python matplotlib > 1.2** (`python-matplotlib`, needed for the several wxGUI tools)
102+
- **Python matplotlib > 1.2** (`python-matplotlib`, needed for the several wxGUI
103+
tools)
97104
[https://matplotlib.org/](https://matplotlib.org/)
98105
- **Python wxPython backend for python-matplotlib**
99-
("python-matplotlib-wx", needed for e.g. `g.gui.timeline`)
106+
("python-matplotlib-wx", needed for e.g. `g.gui.timeline`)
100107
[https://matplotlib.org/](https://matplotlib.org/)
101-
- **python-termcolor** (recommended for `g.search.modules`)
108+
- **python-termcolor** (recommended for `g.search.modules`)
102109
[https://pypi.org/project/termcolor/](https://pypi.org/project/termcolor/)
103-
- **six** (`python-six`, needed for Python API and for cross-version Python compatibility)
104-
[https://pypi.python.org/pypi/six](https://pypi.python.org/pypi/six)
110+
- **six** (`python-six`, needed for Python API and for cross-version Python
111+
compatibility)
112+
[https://pypi.python.org/pypi/six](https://pypi.python.org/pypi/six)
105113
[https://github.com/benjaminp/six](https://github.com/benjaminp/six)
106-
- **FFMPEG or alternative** (for wxGUI Animation tool - `g.gui.module`), specifically ffmpeg tool
114+
- **FFMPEG or alternative** (for wxGUI Animation tool - `g.gui.module`),
115+
specifically ffmpeg tool
107116
[https://ffmpeg.org](https://ffmpeg.org)
108-
- **mpeg_encode or ppmtompeg tool** (for `r.out.mpeg` module)
117+
- **mpeg_encode or ppmtompeg tool** (for `r.out.mpeg` module)
109118
[https://ffmpeg.org](https://ffmpeg.org)
110-
- **Cairo >= 1.5.8** (for Cairo driver)
119+
- **Cairo >= 1.5.8** (for Cairo driver)
111120
[https://cairographics.org](https://cairographics.org)
112-
- **AVCE00 and E00Compr Libraries** (avcimport)
121+
- **AVCE00 and E00Compr Libraries** (avcimport)
113122
[http://avce00.maptools.org](http://avce00.maptools.org)
114-
- **git** (git for `g.extension`)
123+
- **git** (git for `g.extension`)
115124
[https://git-scm.com](https://git-scm.com)
116-
- **Subversion** (svn in `g.extension` to fetch code selectively from grass-addons on GitHub)
125+
- **Subversion** (svn in `g.extension` to fetch code selectively from grass-addons
126+
on GitHub)
117127
[https://subversion.apache.org/](https://subversion.apache.org/)
118128

119129
## Note
120130

121-
SUN Solaris users may go here to download precompiled libraries etc.:
131+
SUN Solaris users may go here to download precompiled libraries etc.:
122132
[https://www.sunfreeware.com](https://www.sunfreeware.com)
123133

124-
SGI IRIX users may go here to download precompiled libraries etc.:
134+
SGI IRIX users may go here to download precompiled libraries etc.:
125135
[https://freeware.sgi.com](https://freeware.sgi.com)
126136

127-
MacOSX users may go here to download precompiled libraries etc.:
137+
MacOSX users may go here to download precompiled libraries etc.:
128138
[https://fink.sourceforge.net](https://fink.sourceforge.net)
129139

130140
---
131141

132-
_© GRASS Development Team 1997-2023_
142+
© _GRASS Development Team 1997-2023_
133143

134-
Please report bugs here:
144+
Please report bugs here:
135145
[https://grass.osgeo.org/contribute/](https://grass.osgeo.org/contribute/)

TODO

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
- i18n translations
99

1010

11-
> 6.1.0
11+
> 6.1.0
1212
-------
1313

1414
Vector TODO: see doc/vector/TODO

0 commit comments

Comments
 (0)