Skip to content

Commit bc4c09e

Browse files
authored
Applying precommit commonhooks (#10897)
2 parents b2f8126 + ad52262 commit bc4c09e

File tree

228 files changed

+2451
-2475
lines changed

Some content is hidden

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

228 files changed

+2451
-2475
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!---
22
Include a few sentences describing the overall goals for this Pull Request.
3-
3+
44
A list of issues is at https://github.com/qgis/QGIS-Documentation/issues.
55
Add "fix #issuenumber" for each issue the PR fixes. The ticket(s) will be closed automatically.
66
If your PR doesn't fix entirely the ticket, only add the ticket(s) reference preceded by # character.

.github/workflows/pofiles.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,16 @@ jobs:
4545

4646
- name: Install dependencies
4747
run: |
48-
python -m pip install --upgrade pip
49-
pip install -r REQUIREMENTS.txt
48+
python -m pip install --upgrade pip
49+
pip install -r REQUIREMENTS.txt
5050
5151
- name: Generate English PO files
5252
id: "generate-po-files"
5353
run: |
54-
make gettext
55-
sphinx-intl update -p build/gettext -l en
56-
# Remove obsolete strings from the generated *.po files
57-
find locale/en/LC_MESSAGES/ -type f -name '*.po' -exec sed -i '/^#~ /,/^$/d' {} \;
54+
make gettext
55+
sphinx-intl update -p build/gettext -l en
56+
# Remove obsolete strings from the generated *.po files
57+
find locale/en/LC_MESSAGES/ -type f -name '*.po' -exec sed -i '/^#~ /,/^$/d' {} \;
5858
5959
- name: Commit the changes in the PO files
6060
id: "auto-commit-action"

.mailmap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Arnaud Morvan <arnaud.morvan@camptocamp.com> arnaud.morvan@camptocamp.com <arna
2929

3030
Ayodele Adeyemo <christad92@gmail.com> christad92 <christad92@gmail.com>
3131

32-
Báthory Péter <bathory86p@gmail.com> Péter Báthory <peter.bathory@cartographia.hu>
32+
Báthory Péter <bathory86p@gmail.com> Péter Báthory <peter.bathory@cartographia.hu>
3333

3434
Benoit De Mezzo <benoit.de.mezzo@oslandia.com> bdm-oslandia <benoit.de.mezzo@oslandia.com>
3535
Benoit De Mezzo <benoit.de.mezzo@oslandia.com> benoitdm-oslandia <64401067+benoitdm-oslandia@users.noreply.github.com>
@@ -180,7 +180,7 @@ Patrice Pineault <TurboGraphxBeige@runbox.com> TurboGraphxBeige <TurboGraphxBei
180180
Paul Blottiere <blottiere.paul@gmail.com> Blottiere Paul <blottiere.paul@gmail.com>
181181

182182
Philip Albrecht <albrecht@gbd-consult.de> PhilipAlbrecht <45685457+PhilipAlbrecht@users.noreply.github.com>
183-
Philip Albrecht <albrecht@gbd-consult.de> albrecht <albrecht@gbd-consult.de>
183+
Philip Albrecht <albrecht@gbd-consult.de> albrecht <albrecht@gbd-consult.de>
184184

185185
Régis Haubourg <regis@qgis.org> Régis Haubourg <1629853+haubourg@users.noreply.github.com>
186186
Régis Haubourg <regis@qgis.org> Régis Haubourg <regis.haubourg@oslandia.com>

.pre-commit-config.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,25 @@
55

66
repos:
77

8+
# Standard pre-commit hooks
9+
- repo: https://github.com/pre-commit/pre-commit-hooks
10+
rev: v4.5.0
11+
hooks:
12+
- id: trailing-whitespace
13+
args: [--markdown-linebreak-ext=md]
14+
exclude: ^(locale/|_dummy/)
15+
- id: end-of-file-fixer
16+
exclude: ^(locale/|_dummy/)
17+
- id: check-yaml
18+
args: [--unsafe]
19+
- id: check-json
20+
- id: check-merge-conflict
21+
- id: check-added-large-files
22+
args: ['--maxkb=1024']
23+
- id: mixed-line-ending
24+
args: [--fix=lf]
25+
exclude: ^(locale/|_dummy/)
26+
827
# YAML formatting
928
- repo: https://github.com/adrienverge/yamllint
1029
rev: v1.33.0

.tx/config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
[main]
22
host = https://app.transifex.com
33
lang_map = zh-Hant: zh_Hant, zh-Hans: zh_Hans
4-

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ site: html zip
9797

9898
full: html zip
9999
make LANG=$(LANG) pdf;
100-
100+
101101
# this will build ALL languages, AND tries to rsync them to the web dir on qgis2
102102
# to be able to run this you will need a key on the server
103103
all: springclean
@@ -141,4 +141,3 @@ doctest:
141141
linkcheck:
142142
$(SPHINXBUILD) -b linkcheck $(SOURCEDIR) $(BUILDDIR)/linkcheck
143143
@echo "Check finished. Report is in $(BUILDDIR)/linkcheck/output.txt."
144-

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ make -f venv.mk cleanall
9191
### Fixing build locale error on macOS
9292

9393
When the build on macOS fails with:
94-
94+
9595
```sh
9696
locale.Error: unsupported locale setting
9797
make: *** [html] Error 1
@@ -228,7 +228,7 @@ and some custom scripts:
228228
```
229229
---
230230

231-
* The transifex integration bot:
231+
* The transifex integration bot:
232232
manages pulls and pushes of the strings, in other words:
233233
- Tracks any changes of the English `*.po` resource files in GitHub
234234
and automatically sends them to the Transifex platform
@@ -357,4 +357,3 @@ which does not appear in documentation with directive ``testsetup``, for example
357357

358358
For more information see *Sphinx* doctest extension documentation:
359359
https://www.sphinx-doc.org/en/master/usage/extensions/doctest.html
360-

clean.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@ rm -rf .vscode-extensions
66
rm -rf __pycache__
77
cd ..
88
cd -
9-

docs/about/contributors.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Below are listed people who dedicate their time and energy to write, review,
2626
and update the whole QGIS documentation.
2727

2828
.. csv-table::
29-
:widths: auto
29+
:widths: auto
3030

3131
"Tim Sutton", "Yves Jacolin", "Jacob Lanstorp", "Gary E. Sherman", "Richard Duivenvoorde"
3232
"Tara Athan", "Anita Graser", "Arnaud Morvan", "Gavin Macaulay", "Luca Casagrande"
@@ -61,7 +61,7 @@ and update the whole QGIS documentation.
6161
"Jakob Miksch", "Nicolas Boisteault", "Bertrand Rix", "Jorge Rosales", "Selma Vidimlic"
6262

6363

64-
.. index::
64+
.. index::
6565
single: Contributors; Translators
6666
.. _doc_translators:
6767

@@ -78,7 +78,7 @@ The current translations are made possible thanks to:
7878

7979
.. csv-table::
8080
:header: "Language", "Contributors"
81-
:widths: 15, 80
81+
:widths: 15, 80
8282

8383
"Bahasa Indonesia", "Emir Hartato, I Made Anombawa, Januar V. Simarmata,
8484
Muhammad Iqnaul Haq Siregar, Trias Aditya"

docs/about/features.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ use something like:
208208
$ ulimit -Sn #number_of_allowed_open_files
209209
$ ulimit -Sn
210210
$ qgis
211-
211+
212212
Alternatively, you can use the newer ``prlimit`` utility. More info: https://man7.org/linux/man-pages/man1/prlimit.1.html
213213

214214

0 commit comments

Comments
 (0)