Merge pull request #277 from bgilbert/future

pre-commit: require PEP 563 type annotations

Author: bgilbert

.pre-commit-config.yaml

@@ -64,3 +64,18 @@ repos:
     hooks:
       - id: check-hooks-apply
       - id: check-useless-excludes
+
+  - repo: local
+    hooks:
+      - id: annotations
+        name: Require "from __future__ import annotations"
+        language: pygrep
+        types: [python]
+        # exclude config-like files
+        exclude: "^(setup\\.py|doc/conf\\.py|openslide/_version\\.py)$"
+        # Allow files with import statement, or of less than two characters.
+        # One-character files are allowed because that's the best we can do
+        # with paired negative lookbehind and lookahead assertions.  ^ and $
+        # don't work because --multiline causes them to match at newlines.
+        entry: "(?<!.)(?!.)|\nfrom __future__ import annotations"
+        args: [--multiline, --negate]

doc/jekyll_fix.py

@@ -23,6 +23,8 @@
 # deployed to the website.
 # Rename Sphinx output paths to drop the underscore.
 
+from __future__ import annotations
+
 import os
 
 from sphinx.util import logging

examples/deepzoom/deepzoom_multiserver.py

@@ -19,6 +19,8 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
+from __future__ import annotations
+
 from argparse import ArgumentParser
 import base64
 from collections import OrderedDict

examples/deepzoom/deepzoom_server.py

@@ -19,6 +19,8 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
+from __future__ import annotations
+
 from argparse import ArgumentParser
 import base64
 from io import BytesIO

examples/deepzoom/deepzoom_tile.py

@@ -21,6 +21,8 @@
 
 """An example program to generate a Deep Zoom directory tree from a slide."""
 
+from __future__ import annotations
+
 from argparse import ArgumentParser
 import base64
 from io import BytesIO

openslide/__init__.py

@@ -23,6 +23,8 @@
 This package provides Python bindings for the OpenSlide library.
 """
 
+from __future__ import annotations
+
 from collections.abc import Mapping
 from io import BytesIO
 

openslide/deepzoom.py

@@ -23,6 +23,8 @@
 OpenSlide objects.
 """
 
+from __future__ import annotations
+
 from io import BytesIO
 import math
 from xml.etree.ElementTree import Element, ElementTree, SubElement

openslide/lowlevel.py

@@ -30,6 +30,8 @@
 rather than in the high-level interface.)
 """
 
+from __future__ import annotations
+
 from ctypes import (
     POINTER,
     byref,

tests/common.py

@@ -17,6 +17,8 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
+from __future__ import annotations
+
 import os
 from pathlib import Path
 

tests/test_base.py

@@ -17,6 +17,8 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
+from __future__ import annotations
+
 import ctypes
 import unittest
 
@@ -35,13 +37,17 @@ def test_open_slide(self):
     def test_lowlevel_available(self):
         '''Ensure all exported functions have an 'available' attribute.'''
         for name in dir(lowlevel):
+            attr = getattr(lowlevel, name)
             # ignore classes and unexported functions
             if name.startswith('_') or name[0].isupper():
                 continue
+            # ignore __future__ imports
+            if getattr(attr, '__module__', None) == '__future__':
+                continue
             # ignore random imports
             if hasattr(ctypes, name) or name in ('count', 'platform'):
                 continue
             self.assertTrue(
-                hasattr(getattr(lowlevel, name), 'available'),
+                hasattr(attr, 'available'),
                 f'"{name}" missing "available" attribute',
             )