Skip to content

Commit

Permalink
lint: fix pre-commit warnings/errors (#3246)
Browse files Browse the repository at this point in the history
  • Loading branch information
nilason authored Nov 22, 2023
1 parent 49fb2d9 commit ef229b7
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 7 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/python-code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,10 @@ jobs:
- name: Run Pylint on other files using pytest
run: |
pip install pytest pytest-pylint==0.19

Check warning on line 116 in .github/workflows/python-code-quality.yml

View workflow job for this annotation

GitHub Actions / Python Code Quality (ubuntu-22.04, 3.10, 3.7, 23.1.0, 3.9.2, 2.12.2)

Temporarily downgraded pytest-pylint to allow merging other PRs. The errors reported with a newer version seem legitimite and should be fixed (2023-10-18, see https://github.com/OSGeo/grass/pull/3205)
echo "::warning file=.github/workflows/python-code-quality.yml,line=116,col=42,endColumn=48::Temporarily downgraded pytest-pylint to allow merging other PRs. The errors reported with a newer version seem legitimite and should be fixed (2023-10-18, see https://github.com/OSGeo/grass/pull/3205)"
echo "::warning file=.github/workflows/python-code-quality.yml,line=116,col=42,endColumn=48::\
Temporarily downgraded pytest-pylint to allow merging other PRs. The errors reported\
with a newer version seem legitimite and should be fixed (2023-10-18,\
see https://github.com/OSGeo/grass/pull/3205)"
export PYTHONPATH=`grass --config python_path`:$PYTHONPATH
export LD_LIBRARY_PATH=$HOME/install/grass84/lib:$LD_LIBRARY_PATH
pytest --pylint -m pylint --pylint-rcfile=.pylintrc --pylint-jobs=$(nproc) \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1.6

# Note: This file must be kept in sync in ./Dockerfile and ./docker/ubuntu/Dockerfile.
# Changes to this file must be copied over to the other file.
# Changes to this file must be copied over to the other file.

ARG GUI=without

Expand Down
2 changes: 1 addition & 1 deletion docker/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1.6

# Note: This file must be kept in sync in ./Dockerfile and ./docker/ubuntu/Dockerfile.
# Changes to this file must be copied over to the other file.
# Changes to this file must be copied over to the other file.

ARG GUI=without

Expand Down
1 change: 0 additions & 1 deletion locale/transifex/.tx/config
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ source_file = ../templates/grasswxpy.pot
source_lang = en
file_filter = ../po/grasswxpy_<lang>.po
type = PO

6 changes: 3 additions & 3 deletions locale/transifex/transifex_merge_2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

# Required installation:
# sudo pip3 install transifex-client
# see also: https://grasswiki.osgeo.org/wiki/GRASS_messages_translation#Get_the_translated_po_files
# see also: https://grasswiki.osgeo.org/wiki/GRASS_messages_translation#Get_the_translated_po_files

# Usage:
# this script has to be launched in the `locale/` directory.
Expand Down Expand Up @@ -40,12 +40,12 @@ for fil in `ls $NEWLIBPODIR`;
do
# TODO: keep uppercase for pt_BR etc - rename in SVN as needed
MYLANG=`echo $fil | sed 's+_translation++g'`

# LV is not translated in Tx thus skip it
if [[ ${MYLANG} == "lv" ]]; then
continue
fi

# https://www.gnu.org/software/gettext/manual/html_node/msgmerge-Invocation.html#msgmerge-Invocation
# if po file locally present, update it, otherwise copy over new file from transifex
if [ -f grasslibs_${MYLANG}.po ]; then
Expand Down

0 comments on commit ef229b7

Please sign in to comment.