From e61d82e0250c2948e5c2f6bd56ca36f2fce51ea1 Mon Sep 17 00:00:00 2001
From: Benjamin Renard <brenard@easter-eggs.com>
Date: Sun, 1 May 2022 01:52:46 +0200
Subject: [PATCH] Fix some pylint warning (and CI step dependency)

---
 .woodpecker.yml |  1 +
 gitdch          | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index b69dffc..2200e22 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -8,6 +8,7 @@ pipeline:
     group: test
     image: pipelinecomponents/pylint
     commands:
+      - pip install GitPython --quiet
       - pylint gitdch
 
   test-flake8:
diff --git a/gitdch b/gitdch
index d946f87..3bbb0e1 100755
--- a/gitdch
+++ b/gitdch
@@ -55,7 +55,7 @@ parser.add_argument(
     '--path',
     type=str,
     dest='git_path',
-    help='Git repository path (default: %s)' % DEFAULT_GIT_PATCH,
+    help=f'Git repository path (default: {DEFAULT_GIT_PATCH}',
     default=DEFAULT_GIT_PATCH
 )
 
@@ -97,7 +97,7 @@ parser.add_argument(
     '--code-name',
     type=str,
     dest='code_name',
-    help='Debian code name (default: %s)' % DEFAULT_CODE_NAME,
+    help=f'Debian code name (default: {DEFAULT_CODE_NAME})',
     default=DEFAULT_CODE_NAME
 )
 
@@ -106,7 +106,7 @@ parser.add_argument(
     '--urgency',
     type=str,
     dest='urgency',
-    help='Package urgency (default: %s)' % DEFAULT_URGENCY,
+    help=f'Package urgency (default: {DEFAULT_URGENCY})',
     default=DEFAULT_URGENCY
 )
 
@@ -135,9 +135,7 @@ if not options.package_name:
 # Initialize log
 log = logging.getLogger()
 logformat = logging.Formatter(
-    "%(asctime)s - {0} - %(levelname)s : %(message)s".format(
-        os.path.basename(sys.argv[0])
-    )
+    f'%(asctime)s - {os.path.basename(sys.argv[0])} - %(levelname)s : %(message)s'
 )
 # Set root logger to DEBUG (filtering done by handlers)
 log.setLevel(logging.DEBUG)
@@ -223,8 +221,9 @@ log.info('%d versions found', len(versions))
 
 changelog_lines = []
 for version in versions:
+    # pylint: disable=consider-using-f-string
     changelog_lines.append(
-        '{package} ({version}-1) {code_name}; urgency={urgency}\n\n'.format(
+        '{package} ({version}-1) {code_name}; urgency={urgency}'.format(
             package=options.package_name,
             version=version['name'],
             code_name=options.code_name,
@@ -234,6 +233,7 @@ for version in versions:
     for message in version['messages']:
         changelog_lines.append('  * {0}\n'.format(message))
 
+    # pylint: disable=consider-using-f-string
     changelog_lines.append(
         "\n -- {name} <{email}>  {date}\n\n".format(
             name=(
@@ -249,7 +249,7 @@ for version in versions:
 
 if options.output:
     log.info('Write generated Debian changelog in file %s', options.output)
-    with open(options.output, 'w') as fd:
+    with open(options.output, 'w', encoding='utf8') as fd:
         fd.writelines(changelog_lines)
 else:
     print(''.join(changelog_lines))