Clean up and enable linting for tests and scripts.

Add type hints to deprecated parser functions.  These functions can now
take str.

Fix Python version mypy setting.  For now this will be set to Python 3.8
globally and other tests will be used to check earlier versions.

Remove dev scripts, these were old experiments for tdl.

Associate PyInstaller spec files with Python.

Author: HexDecimal

.github/workflows/python-lint.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Install Python dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install flake8 mypy black isort
+        python -m pip install flake8 mypy black isort pytest
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
     - name: Fake initialize package
       run: |
@@ -32,23 +32,23 @@ jobs:
       uses: liskin/gh-problem-matcher-wrap@v1
       with:
         linters: flake8
-        run: flake8 scripts/ tcod/
+        run: flake8 scripts/ tcod/ tests/
     - name: MyPy
       if: always()
       uses: liskin/gh-problem-matcher-wrap@v1
       with:
         linters: mypy
-        run: mypy --show-column-numbers scripts/ tcod/
+        run: mypy --show-column-numbers .
     - name: isort
       uses: liskin/gh-problem-matcher-wrap@v1
       with:
         linters: isort
-        run: isort scripts/ tcod/ tests/ *.py --check
+        run: isort scripts/ tcod/ tests/ --check
     - name: isort (examples)
       uses: liskin/gh-problem-matcher-wrap@v1
       with:
         linters: isort
         run: isort examples/ --check --thirdparty tcod
     - name: Black
       run: |
-        black --check examples/ scripts/ tcod/  tests/ *.py
+        black --check examples/ scripts/ tcod/ tests/ *.py

.vscode/settings.json

@@ -11,9 +11,11 @@
     "python.linting.flake8Enabled": true,
     "python.linting.mypyEnabled": true,
     "python.linting.mypyArgs": [
-        "--python-version 3.8", // Python 3.8 supported by examples.
         "--follow-imports=silent",
         "--show-column-numbers"
     ],
-    "python.formatting.provider": "black"
+    "python.formatting.provider": "black",
+    "files.associations": {
+        "*.spec": "python",
+    }
 }

build_libtcod.py

@@ -8,7 +8,7 @@
 import subprocess
 import sys
 import zipfile
-from typing import Any, Dict, Iterable, Iterator, List, Set, Tuple
+from typing import Any, Dict, Iterable, Iterator, List, Set, Tuple, Union
 
 try:
     from urllib import urlretrieve  # type: ignore
@@ -165,7 +165,7 @@ def unpack_sdl2(version: str) -> str:
     if sdl2_arc.endswith(".zip"):
         with zipfile.ZipFile(sdl2_arc) as zf:
             zf.extractall("dependencies/")
-    else:
+    elif sys.platform == "darwin":
         assert sdl2_arc.endswith(".dmg")
         subprocess.check_call(["hdiutil", "mount", sdl2_arc])
         subprocess.check_call(["mkdir", "-p", sdl2_dir])
@@ -190,7 +190,7 @@ def unpack_sdl2(version: str) -> str:
 sources = []  # type: List[str]
 
 libraries = []
-library_dirs = []
+library_dirs: List[str] = []
 define_macros = [("Py_LIMITED_API", 0x03060000)]  # type: List[Tuple[str, Any]]
 
 sources += walk_sources("tcod/")
@@ -281,7 +281,7 @@ def fix_header(filepath: str) -> None:
 tdl_build = os.environ.get("TDL_BUILD", "RELEASE").upper()
 
 MSVC_CFLAGS = {"DEBUG": ["/Od"], "RELEASE": ["/GL", "/O2", "/GS-", "/wd4996"]}
-MSVC_LDFLAGS = {"DEBUG": [], "RELEASE": ["/LTCG"]}
+MSVC_LDFLAGS: Dict[str, List[str]] = {"DEBUG": [], "RELEASE": ["/LTCG"]}
 GCC_CFLAGS = {
     "DEBUG": ["-std=c99", "-Og", "-g", "-fPIC"],
     "RELEASE": [
@@ -348,7 +348,7 @@ def fix_header(filepath: str) -> None:
 '''
 
 
-def find_sdl_attrs(prefix: str) -> Iterator[Tuple[str, Any]]:
+def find_sdl_attrs(prefix: str) -> Iterator[Tuple[str, Union[int, str, Any]]]:
     """Return names and values from `tcod.lib`.
 
     `prefix` is used to filter out which names to copy.
@@ -378,9 +378,7 @@ def parse_sdl_attrs(prefix: str, all_names: List[str]) -> Tuple[str, str]:
         all_names.append(name)
         names.append("%s = %s" % (name, value))
         lookup.append('%s: "%s"' % (value, name))
-    names = "\n".join(names)
-    lookup = "{\n    %s,\n}" % (",\n    ".join(lookup),)
-    return names, lookup
+    return "\n".join(names), "{\n    %s,\n}" % (",\n    ".join(lookup),)
 
 
 EXCLUDE_CONSTANTS = [
@@ -418,7 +416,6 @@ def update_module_all(filename: str, new_all: str) -> None:
 
 def generate_enums(prefix: str) -> Iterator[str]:
     """Generate attribute assignments suitable for a Python enum."""
-    prefix_len = len(prefix) - len("SDL_") + 1
     for name, value in sorted(find_sdl_attrs(prefix), key=lambda item: item[1]):
         name = name.split("_", 1)[1]
         if name.isdigit():
@@ -471,10 +468,10 @@ def write_library_constants() -> None:
             f.write("%s = %r\n" % (name[5:], color))
             all_names.append(name[5:])
 
-        all_names = ",\n    ".join('"%s"' % name for name in all_names)
-        f.write("\n__all__ = [\n    %s,\n]\n" % (all_names,))
-        update_module_all("tcod/__init__.py", all_names)
-        update_module_all("tcod/libtcodpy.py", all_names)
+        all_names_merged = ",\n    ".join('"%s"' % name for name in all_names)
+        f.write("\n__all__ = [\n    %s,\n]\n" % (all_names_merged,))
+        update_module_all("tcod/__init__.py", all_names_merged)
+        update_module_all("tcod/libtcodpy.py", all_names_merged)
 
     with open("tcod/event_constants.py", "w") as f:
         all_names = []
@@ -490,8 +487,8 @@ def write_library_constants() -> None:
 
         f.write("\n# --- SDL wheel ---\n")
         f.write("%s\n_REVERSE_WHEEL_TABLE = %s\n" % parse_sdl_attrs("SDL_MOUSEWHEEL", all_names))
-        all_names = ",\n    ".join('"%s"' % name for name in all_names)
-        f.write("\n__all__ = [\n    %s,\n]\n" % (all_names,))
+        all_names_merged = ",\n    ".join('"%s"' % name for name in all_names)
+        f.write("\n__all__ = [\n    %s,\n]\n" % (all_names_merged,))
 
     with open("tcod/event.py", "r") as f:
         event_py = f.read()