Merge f61f995 into 253e060

.github/workflows/main.yml

@@ -6,7 +6,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.5, 3.6, 3.7, 3.8, 3.9, '3.10', '3.11', 'pypy-3.7']
+        python-version: [3.6, 3.7, 3.8, 3.9, '3.10', '3.11', 'pypy-3.7']
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2

.pylintrc

@@ -19,7 +19,7 @@ disable=
     redefined-builtin, broad-except, protected-access,
     useless-object-inheritance, unnecessary-pass, duplicate-code,
     function-redefined, attribute-defined-outside-init, consider-using-with,
-    consider-using-f-string, deprecated-module
+    deprecated-module
 
 [REPORTS]
 

README.rst

@@ -20,7 +20,7 @@ ANTLR v4 in sync.
 Requirements
 ============
 
-* Python_ >= 3.5
+* Python_ >= 3.6
 * Java_ SE >= 7 JRE or JDK (the latter is optional)
 
 .. _Python: https://www.python.org

setup.cfg

@@ -14,20 +14,20 @@ classifiers =
     Operating System :: OS Independent
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
     Topic :: Software Development :: Code Generators
 platform = any
 
 [options]
 package_dir =
     = src
 packages = find:
-python_requires = >=3.5
+python_requires = >=3.6
 install_requires =
     importlib-metadata; python_version < "3.8"
     inators

src/antlerinator/arg.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Renata Hodovan, Akos Kiss.
+# Copyright (c) 2021-2022 Renata Hodovan, Akos Kiss.
 #
 # Licensed under the BSD 3-Clause License
 # <LICENSE.rst or https://opensource.org/licenses/BSD-3-Clause>.
@@ -16,7 +16,7 @@ def add_antlr_argument(
         long_alias=(),
         *,
         metavar='FILE',
-        help='path of the ANTLR v4 tool jar file (default: %s)' % default_antlr_jar_path(__antlr_version__ or 'VERSION')
+        help=f'path of the ANTLR v4 tool jar file (default: {default_antlr_jar_path(__antlr_version__ or "VERSION")})'
 ):
     """
     add_antlr_argument(parser, short_alias=(), long_alias=(), *, metavar='FILE', help='path of the ANTLR v4 tool jar file (default:  ~/.antlerinator/antlr-VERSION-complete.jar)')

src/antlerinator/build_antlr.py

@@ -44,7 +44,7 @@ def finalize_options(self):
             commands = [cmd.strip() for cmd in commands if cmd.strip()]
 
         if not isinstance(commands, list):
-            raise DistutilsOptionError("'commands' must be a list of strings or tuples (got %r)" % commands)
+            raise DistutilsOptionError(f"'commands' must be a list of strings or tuples (got {commands!r})")
 
         cmd_re = re.compile('^(?P<provider>^[^\\d\\W]\\w*):(?P<provider_arg>\\S*)\\s+(?P<antlr_args>.*)$')
         providers = {
@@ -57,21 +57,21 @@ def finalize_options(self):
             if isinstance(cmd, str):
                 m = cmd_re.match(cmd)
                 if not m:
-                    raise DistutilsOptionError("strings in 'commands' must start with a 'provider:arg' pattern (got %r)" % cmd)
+                    raise DistutilsOptionError(f"strings in 'commands' must start with a 'provider:arg' pattern (got {cmd!r})")
                 provider, provider_arg, antlr_args = m.group('provider', 'provider_arg', 'antlr_args')
 
                 provider = providers.get(provider)
                 if not provider:
-                    raise DistutilsOptionError("unknown provider in 'commands' (options: %s; got: %s)" % (', '.join(providers.keys()), provider))
+                    raise DistutilsOptionError(f"unknown provider in 'commands' (options: {', '.join(providers.keys())}; got: {provider})")
                 antlr_args = tuple(shlex.split(antlr_args, posix=posix))
 
                 cmd = (provider, provider_arg, antlr_args)
 
             if isinstance(cmd, tuple):
                 if len(cmd) != 3:
-                    raise DistutilsOptionError("tuples in 'commands' must be 3-tuples (got %r)" % cmd)
+                    raise DistutilsOptionError(f"tuples in 'commands' must be 3-tuples (got {cmd!r})")
             else:
-                raise DistutilsOptionError("elements in 'commands' must be strings or tuples (got %r)" % commands)
+                raise DistutilsOptionError(f"elements in 'commands' must be strings or tuples (got {commands!r})")
 
             commands[i] = cmd
 

src/antlerinator/download.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2021 Renata Hodovan, Akos Kiss.
+# Copyright (c) 2017-2022 Renata Hodovan, Akos Kiss.
 #
 # Licensed under the BSD 3-Clause License
 # <LICENSE.rst or https://opensource.org/licenses/BSD-3-Clause>.
@@ -42,7 +42,7 @@ def default_antlr_jar_path(version=None):
     version = version or __antlr_version__
     if not version:
         raise ValueError('version must be specified if antlr4 runtime is not installed')
-    return join(expanduser('~'), '.antlerinator', 'antlr-{version}-complete.jar'.format(version=version))
+    return join(expanduser('~'), '.antlerinator', f'antlr-{version}-complete.jar')
 
 
 def download(version=None, path=None, *, force=False, lazy=False):
@@ -64,7 +64,7 @@ def download(version=None, path=None, *, force=False, lazy=False):
 
     default_tool_path = default_antlr_jar_path(version)
     tool_path = path or default_tool_path
-    tool_url = 'https://www.antlr.org/download/{name}'.format(name=basename(default_tool_path))
+    tool_url = f'https://www.antlr.org/download/{basename(default_tool_path)}'
 
     if exists(tool_path):
         if lazy:
@@ -96,7 +96,7 @@ def execute():
     arg_parser.add_argument('--antlr-version', metavar='VERSION', default=__antlr_version__,
                             help='version of ANTLR v4 tool jar to download (default: %(default)s)')
     arg_parser.add_argument('--output', metavar='FILE', default=None,
-                            help='path to save the downloaded jar to (default: %s)' % default_antlr_jar_path('VERSION').replace(expanduser('~'), '~'))
+                            help=f'path to save the downloaded jar to (default: {default_antlr_jar_path("VERSION").replace(expanduser("~"), "~")})')
 
     mode_group = arg_parser.add_mutually_exclusive_group()
     mode_group.add_argument('--force', action='store_true', default=False,