Bump version; Linting

Author: TinoDidriksen

.gitignore

@@ -1,3 +1,4 @@
+/.vscode
 /tests/apertium-apy.err
 /tests/apertium-apy.log
 /langNames.db

Makefile

@@ -18,7 +18,7 @@ unit-test:
 
 lint:
 	flake8 *.py apertium_apy/ language_names/ tests/
-	LC_ALL=C find language_names/*.tsv -print0 | xargs -0 -n1 -I {} sh -c 'tail -n +2 {} | sort -c'
+	LC_ALL=C find language_names/*.tsv -print0 | xargs -0r -I X sh -c 'tail -n +2 X | sort -c'
 	mypy --config-file mypy.ini **/*.py
 
 test: unit-test lint

apertium_apy/apy.py

@@ -3,11 +3,11 @@
 # -*- indent-tabs-mode: nil -*-
 
 __author__ = 'Kevin Brubeck Unhammer, Sushain K. Cherivirala'
-__copyright__ = 'Copyright 2013--2020, Kevin Brubeck Unhammer, Sushain K. Cherivirala'
+__copyright__ = 'Copyright 2013--2025, Kevin Brubeck Unhammer, Sushain K. Cherivirala'
 __credits__ = ['Kevin Brubeck Unhammer', 'Sushain K. Cherivirala', 'Jonathan North Washington', 'Xavi Ivars', 'Shardul Chiplunkar']
 __license__ = 'GPLv3'
 __status__ = 'Beta'
-__version__ = '0.12.1'
+__version__ = '0.13.0'
 
 import argparse
 import configparser

apertium_apy/gateway.py

@@ -116,7 +116,7 @@ def post(self):
 class ListRequestHandler(BaseHandler):
     """Handler for list requests. Takes a language-pair-server map and aggregates the language-pairs of all of the servers."""
 
-    def initialize(self, server_lang_pair_map):
+    def initialize(self, server_lang_pair_map):  # type: ignore[override]
         self.server_lang_pair_map = server_lang_pair_map
         callbacks = self.get_arguments('callback')
         if callbacks:
@@ -183,7 +183,7 @@ def __init__(self, servers, langpairmap):
         self.langpairmap = langpairmap
         self.generator = itertools.cycle(self.serverlist)
 
-    def get_server(self, lang_pair, mode='pairs', *args, **kwargs):
+    def get_server(self, lang_pair, mode='pairs', *args, **kwargs):  # type: ignore[override]
         # when we get a /perWord request, we have multiple modes, all of which have to be on the server
         # the modes will not be 'pairs'
         if 'per_word_modes' in kwargs and kwargs['per_word_modes'] is not None:
@@ -284,7 +284,7 @@ def __init__(self, servers, server_capabilities, num_responses):
         self.num_responses = num_responses
         self.init_server_list(server_capabilities=server_capabilities)
 
-    def get_server(self, lang_pair, mode, *args, **kwargs):
+    def get_server(self, lang_pair, mode, *args, **kwargs):  # type: ignore[override]
         if len(self.serverlist):
             mode_to_url = {'pairs': 'translate', 'generators': 'generate', 'analyzers': 'analyze', 'taggers': 'tag', 'coverage': 'analyze', 'guessers': 'guesser'}
             if mode in mode_to_url:

apertium_apy/handlers/base.py

@@ -35,7 +35,7 @@ class BaseHandler(tornado.web.RequestHandler):
     generators = {}  # type: Dict[str, Tuple[str, str]]
     taggers = {}  # type: Dict[str, Tuple[str, str]]
     spellers = {}  # type: Dict[str, Tuple[str, str]]
-    guessers = {}
+    guessers = {}  # type: Dict[str, Tuple[str, str]]
     pairprefs = {}        # type: Dict[str, Dict[str, Dict[str, str]]]
     # (l1, l2): [translation.Pipeline], only contains flushing pairs!
     pipelines = {}  # type: Dict[Tuple[str, str], List[Union[FlushingPipeline, SimplePipeline]]]

tests/test.py

@@ -80,7 +80,7 @@ def get_app(self):
     def get_http_port(self):
         return PORT
 
-    def fetch(self, path, params={}, **kwargs):
+    def fetch(self, path, params={}, **kwargs):  # type: ignore[override]
         if params:
             method = kwargs.get('method', 'GET')
             if method == 'GET':