Skip to content

Commit

Permalink
Fix trailing whitespace, EOF and file formatting (OSGeo#2785)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
nilason authored Jan 26, 2023
1 parent d0a9538 commit cdd84c1
Show file tree
Hide file tree
Showing 980 changed files with 7,764 additions and 8,107 deletions.
28 changes: 28 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,35 @@ repos:
rev: v4.4.0
hooks:
- id: trailing-whitespace
exclude: |
(?x)^(
configure$|
.*\.ascii$|
.*\.asc$|
.*\.ref$|
raster3d/r3.null/testsuite/data/test_volume_.*|
mswindows/.*|
.*\.po$|
.*\.ps$|
.*\.svg$|
python/libgrass_interface_generator/ctypesgen/|
lib/fonts/fonts/.*
)
- id: end-of-file-fixer
exclude: |
(?x)^(
configure$|
.*\.ascii$|
.*\.asc$|
.*\.ref$|
python/grass/pygrass/raster/testsuite/data/geology_cats|
mswindows/.*|
.*\.po$|
.*\.ps$|
.*\.svg$|
python/libgrass_interface_generator/ctypesgen/|
lib/fonts/fonts/.*
)
- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.33.0
hooks:
Expand Down
1 change: 0 additions & 1 deletion .travis/linux.before_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@ set -e
# build dependencies
sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable -y
sudo apt-get update -qq

1 change: 0 additions & 1 deletion .travis/linux.install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,3 @@ sudo apt-get install --no-install-recommends \
pdal \
proj-bin \
proj-data

38 changes: 19 additions & 19 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ DOCUMENTATION

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

Expand All @@ -168,7 +168,7 @@ INTERNATIONALIZATION
- Arabic: Dr. Alaa Masoud
- Chinese: Zhang Jun
- Czech: Martin Landa, Jachym Cepicky, Michal Bil, Radim Blazek
- German: Stephan Holl
- German: Stephan Holl
- French: Emmanuel Saracco, Daniel Calvelo, Laurent Courty
- Italian: Maurizio Napolitano, Luciano Montanaro, Lorenzo Moretti
- Japanese: Susumu Nonogaki
Expand Down Expand Up @@ -221,7 +221,7 @@ VECTOR
- Radim Blazek <blazek itc it>: vector engine core developer
- David D Gray: vector engine contributions
- modules: see individual authors and ./contributors.csv

DBMI
- based on original code from GRASS 5.0 (developer unknown, CERL?)
- Radim Blazek <blazek itc it>: core developer of 5.7 enhancements
Expand All @@ -233,7 +233,7 @@ DGLib: vector networking
network analysis

FORMS library
- Radim Blazek <blazek itc it>: core developer
- Radim Blazek <blazek itc it>: core developer

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

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

Institutions:
Expand All @@ -285,31 +285,31 @@ Institutions:

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

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

- National Center for Supercomputing Applications, USA
Lubos Mitas (multivariate spline interpolation (RST) and erosion modeling)

- High Performance Computing Center, Thailand
National Electronics and Computer Technology Center
Bangkok, Thailand
Expand All @@ -386,9 +386,9 @@ development team, listed below, as many are still active in the
project and GRASS GIS owes much of itself to the generosity of their
bright minds.

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


Expand Down
2 changes: 1 addition & 1 deletion COPYING
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ GRASS Development Team at the following address:
GRASS Development Team
c/o Markus Neteler
mundialis GmbH & Co. KG
Kölnstrasse 99
Kölnstrasse 99
53111 Bonn, Germany
neteler AT osgeo.org

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ libs:
$(MAKE) subdirs SUBDIRS=$(LIBDIRS)
$(MAKE) $(FILES_DST)

cleandistdirs:
cleandistdirs:
-rm -rf $(ARCH_DISTDIR)
-rm -rf $(ARCH_BINDIR)

Expand Down
116 changes: 63 additions & 53 deletions REQUIREMENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,119 +17,129 @@ To enable and disable features please read the [INSTALL.md](INSTALL.md) file.
Most tools are standard tools on GNU/Linux,
for other platforms you may have to install some of them.

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

## Optional packages

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

- **C++ Compiler** (required for various C++ GRASS modules)
- **C++ Compiler** (required for various C++ GRASS modules)
gcc: [https://www.gnu.org/software/gcc/gcc.html](https://www.gnu.org/software/gcc/gcc.html)
- **bzip2**, needed for raster compression with bzip2
- **bzip2**, needed for raster compression with bzip2
[https://www.bzip.org](https://www.bzip.org)
- **zstd** (Zstandard), needed for raster compression with zstd
- **zstd** (Zstandard), needed for raster compression with zstd
[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
required for `i.fft` and `i.ifft` and other modules
[http://www.fftw.org](http://www.fftw.org)
- **GEOS** (Geometry Engine library),
needed for `v.buffer` and adds extended options to the `v.select` module
needed for `v.buffer` and adds extended options to the `v.select` module
[https://libgeos.org/](https://libgeos.org/)
- **LAPACK / BLAS** (libraries for numerical computing) for GMATH library (GRASS Numerical Library)
[https://www.netlib.org/lapack](https://www.netlib.org/lapack) (usually available on Linux distros)
- **LAPACK / BLAS** (libraries for numerical computing) for GMATH library
(GRASS Numerical Library)
[https://www.netlib.org/lapack](https://www.netlib.org/lapack) (usually
available on Linux distros)
_Note: LAPACK/BLAS support is at time only needed for selected Addons._
- **NetCDF** (for 3D raster netcdf export)
- **NetCDF** (for 3D raster netcdf export)
[https://www.unidata.ucar.edu/software/netcdf/](https://www.unidata.ucar.edu/software/netcdf/)
- **Mesa-3.x**, if hardware OpenGL support is missing in the X Server (OpenGL clone) may be required for wxNVIZ
- **Mesa-3.x**, if hardware OpenGL support is missing in the X Server (OpenGL
clone) may be required for wxNVIZ
[https://mesa3d.org/](https://mesa3d.org/)
- **libpng** (for `r.out.png` and the PNG driver), usually already installed.
- **libpng** (for `r.out.png` and the PNG driver), usually already installed.
[http://www.libpng.org/pub/png/libpng.html](http://www.libpng.org/pub/png/libpng.html)
- **libtiff** (for `r.out.tiff`), usually already installed.
- **libtiff** (for `r.out.tiff`), usually already installed.
[https://gitlab.com/libtiff/libtiff](https://gitlab.com/libtiff/libtiff)
- **readline** for extra command prompt functionality
[https://tiswww.case.edu/~chet/readline/rltop.html](https://tiswww.case.edu/~chet/readline/rltop.html)
- **readline** for extra command prompt functionality
[https://tiswww.case.edu/~chet/readline/rltop.html](https://tiswww.case.edu/~chet/readline/rltop.html)
[ftp://ftp.gnu.org/gnu/readline](ftp://ftp.gnu.org/gnu/readline)
- **PostgreSQL libraries** (for the PostgreSQL database interface and PostGIS support)
- **PostgreSQL libraries** (for the PostgreSQL database interface and PostGIS support)
[https://www.postgresql.org](https://www.postgresql.org)
- **MariaDB/MySQL libraries** (for the MySQL database interface)
- **MariaDB/MySQL libraries** (for the MySQL database interface)
[https://mariadb.org/](https://mariadb.org/)
- **SQLite libraries** (for the SQLite database interface)
- **SQLite libraries** (for the SQLite database interface)
[https://www.sqlite.org](https://www.sqlite.org)
- **unixODBC** (for the ODBC database interface)
- **unixODBC** (for the ODBC database interface)
[http://www.unixodbc.org](http://www.unixodbc.org)
- **R Statistics** (for the R statistical language interface)
- **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`)
- **FreeType2** (for TrueType font support and `d.text.freetype`)
[https://freetype.org/](https://freetype.org/)
- **Ctypes** (for ctypes interface)
- **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/)
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)
- **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)
- **NumPy >= 1.0.4** (for various wxGUI components and pyGRASS)
[https://numpy.org](https://numpy.org)
- **Python dateutil Library** (`python-dateutil`, needed for the tgrass modules `t.*`)
[https://pypi.org/project/python-dateutil/](https://pypi.org/project/python-dateutil/)
- **Python dateutil Library** (`python-dateutil`, needed for the tgrass modules `t.*`)
[https://pypi.org/project/python-dateutil/](https://pypi.org/project/python-dateutil/)
[https://github.com/dateutil/dateutil](https://github.com/dateutil/dateutil)
- **Python PLY Library (Python Lex-Yacc)** (`python-ply`, needed for the temporal algebra in tgis)
- **Python PLY Library (Python Lex-Yacc)** (`python-ply`, needed for the
temporal algebra in tgis)
[https://www.dabeaz.com/ply](https://www.dabeaz.com/ply/)
- **Pillow (Python Imaging Library)** (highly recommended for wxGUI and necessary for wxGUI Cartographic Composer)
- **Pillow (Python Imaging Library)** (highly recommended for wxGUI and
necessary for wxGUI Cartographic Composer)
[https://python-pillow.org/](https://python-pillow.org/)
- **Python matplotlib > 1.2** (`python-matplotlib`, needed for the several wxGUI tools)
- **Python matplotlib > 1.2** (`python-matplotlib`, needed for the several wxGUI
tools)
[https://matplotlib.org/](https://matplotlib.org/)
- **Python wxPython backend for python-matplotlib**
("python-matplotlib-wx", needed for e.g. `g.gui.timeline`)
("python-matplotlib-wx", needed for e.g. `g.gui.timeline`)
[https://matplotlib.org/](https://matplotlib.org/)
- **python-termcolor** (recommended for `g.search.modules`)
- **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)
- **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
- **FFMPEG or alternative** (for wxGUI Animation tool - `g.gui.module`),
specifically ffmpeg tool
[https://ffmpeg.org](https://ffmpeg.org)
- **mpeg_encode or ppmtompeg tool** (for `r.out.mpeg` module)
- **mpeg_encode or ppmtompeg tool** (for `r.out.mpeg` module)
[https://ffmpeg.org](https://ffmpeg.org)
- **Cairo >= 1.5.8** (for Cairo driver)
- **Cairo >= 1.5.8** (for Cairo driver)
[https://cairographics.org](https://cairographics.org)
- **AVCE00 and E00Compr Libraries** (avcimport)
- **AVCE00 and E00Compr Libraries** (avcimport)
[http://avce00.maptools.org](http://avce00.maptools.org)
- **git** (git for `g.extension`)
- **git** (git for `g.extension`)
[https://git-scm.com](https://git-scm.com)
- **Subversion** (svn in `g.extension` to fetch code selectively from grass-addons on GitHub)
- **Subversion** (svn in `g.extension` to fetch code selectively from grass-addons
on GitHub)
[https://subversion.apache.org/](https://subversion.apache.org/)

## Note

SUN Solaris users may go here to download precompiled libraries etc.:
SUN Solaris users may go here to download precompiled libraries etc.:
[https://www.sunfreeware.com](https://www.sunfreeware.com)

SGI IRIX users may go here to download precompiled libraries etc.:
SGI IRIX users may go here to download precompiled libraries etc.:
[https://freeware.sgi.com](https://freeware.sgi.com)

MacOSX users may go here to download precompiled libraries etc.:
MacOSX users may go here to download precompiled libraries etc.:
[https://fink.sourceforge.net](https://fink.sourceforge.net)

---

_© GRASS Development Team 1997-2023_
© _GRASS Development Team 1997-2023_

Please report bugs here:
Please report bugs here:
[https://grass.osgeo.org/contribute/](https://grass.osgeo.org/contribute/)
2 changes: 1 addition & 1 deletion TODO
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
- i18n translations


> 6.1.0
> 6.1.0
-------

Vector TODO: see doc/vector/TODO
Expand Down
Loading

0 comments on commit cdd84c1

Please sign in to comment.