Add types to please mypy (#201)

* typing: Replace deprecated aliases by buildin types

* typing: Add types to atlas/*, capture/*, conf/*

* typing: Add types to context/*

* typing: Add types to finders/* and geometry/*

* typing: Add types to meta/*, opengl/*, resources/*

* typing: add types to scene/*, text/*, utils/*

* typing: Add types to __init__, screenshot, timers/*

* tests: New test case to timers

* typing: Add types to loaders/*

* typing: Fix other mypy errors/warnings/notes

* Format: use isort

* typing: Add types to loaders/scene/gltf2.py

* Oversight on my part when pygame is not installed

docs/conf.py

@@ -14,15 +14,15 @@
 #
 # import os
 import sys
-
+from typing import Any
 # sys.path.insert(0, os.path.abspath('.'))
 from unittest.mock import MagicMock
 
 
 # Mock modules
 class Mock(MagicMock):
     @classmethod
-    def __getattr__(cls, name):
+    def __getattr__(cls: Any, name: Any) -> MagicMock:
         return MagicMock()
 
 
@@ -141,7 +141,7 @@ def __getattr__(cls, name):
 
 # -- Options for LaTeX output ------------------------------------------------
 
-latex_elements = {
+latex_elements: dict[str, str] = {
     # The paper size ('letterpaper' or 'a4paper').
     #
     # 'papersize': 'letterpaper',

examples/advanced/animated_sprites.py

@@ -1,8 +1,10 @@
-import moderngl
 from pathlib import Path
+
+import glm
+import moderngl
+
 import moderngl_window as mglw
 from moderngl_window import geometry
-import glm
 
 # from moderngl_window.conf import settings
 # settings.SCREENSHOT_PATH = 'screenshots'

examples/advanced/compute_render_to_texture.py

@@ -1,5 +1,7 @@
-import moderngl as mgl
 from pathlib import Path
+
+import moderngl as mgl
+
 import moderngl_window as mglw
 from moderngl_window import geometry
 

examples/advanced/fragment_picking.py

@@ -1,8 +1,9 @@
 import struct
 from pathlib import Path
 
-import moderngl
 import glm
+import moderngl
+
 import moderngl_window
 from moderngl_window import geometry
 from moderngl_window.opengl.projection import Projection3D

examples/advanced/navier_stokes.py

@@ -8,6 +8,7 @@
 
 import random
 from pathlib import Path
+
 import glm
 
 import moderngl_window

examples/advanced/pygame2.py

@@ -5,11 +5,13 @@
 
 import math
 from pathlib import Path
-import pygame
+
+import glm
 import moderngl
+import pygame
+
 import moderngl_window
 from moderngl_window import geometry
-import glm
 
 # from moderngl_window.conf import settings
 # settings.SCREENSHOT_PATH = 'capture'

examples/advanced/pygame2_background_image.py

@@ -7,8 +7,10 @@
 """
 import math
 from pathlib import Path
-import pygame
+
 import moderngl
+import pygame
+
 import moderngl_window
 from moderngl_window import geometry
 

examples/advanced/pygame2_simple.py

@@ -44,9 +44,9 @@
 import math
 from array import array
 
+import moderngl
 import pygame
 
-import moderngl
 import moderngl_window
 
 

examples/advanced/shader_includes.py

@@ -6,6 +6,7 @@
 and render each quadrant of the screen with different blend types
 """
 from pathlib import Path
+
 import moderngl_window as mglw
 from moderngl_window import geometry
 

examples/advanced/shadow_mapping.py

@@ -5,14 +5,14 @@
 
 import math
 from pathlib import Path
-import glm
 
+import glm
 import moderngl
+from base import CameraWindow
+
 import moderngl_window
 from moderngl_window import geometry
 
-from base import CameraWindow
-
 
 class ShadowMapping(CameraWindow):
     title = "Shadow Mapping"

examples/advanced/shadow_mapping_56.py

@@ -5,14 +5,14 @@
 
 import math
 from pathlib import Path
-import glm
 
+import glm
 import moderngl
+from base import CameraWindow
+
 import moderngl_window
 from moderngl_window import geometry
 
-from base import CameraWindow
-
 
 class ShadowMapping(CameraWindow):
     title = "Shadow Mapping"

examples/advanced/tetrahedral_mesh.py

@@ -1,12 +1,13 @@
 from pathlib import Path
-import numpy as np
-import glm
 
+import glm
 import moderngl
-from moderngl_window.opengl.vao import VAO
-from moderngl_window import geometry
+import numpy as np
 from base import CameraWindow
 
+from moderngl_window import geometry
+from moderngl_window.opengl.vao import VAO
+
 
 class VolumetricTetrahedralMesh(CameraWindow):
     """Volumetric Tetrahedral Mesh.

examples/advanced/voxel_cubes.py

@@ -15,14 +15,14 @@
 * We can reduce a voxel volume dramatically by just inspecting neighbors
 """
 
-from pathlib import Path
-from typing import Tuple
 from array import array
+from pathlib import Path
 
+import glm
 import moderngl
-from moderngl_window import geometry
 from base import CameraWindow
-import glm
+
+from moderngl_window import geometry
 
 
 class CubeVoxel(CameraWindow):
@@ -95,7 +95,7 @@ class Voxel:
     We are sticking to simple transforms at textures.
     """
 
-    def __init__(self, *, ctx: moderngl.Context, size: Tuple[int, int, int]):
+    def __init__(self, *, ctx: moderngl.Context, size: tuple[int, int, int]):
         self.ctx = ctx
         self._size = size
 

examples/advanced/water.py

@@ -5,12 +5,12 @@
 """
 import random
 from pathlib import Path
-import numpy as np
 
 import moderngl
+import numpy as np
+
 import moderngl_window
-from moderngl_window import geometry
-from moderngl_window import screenshot
+from moderngl_window import geometry, screenshot
 
 
 class Water(moderngl_window.WindowConfig):

examples/cube_model.py

@@ -1,10 +1,11 @@
 from pathlib import Path
-import glm
 
+import glm
 import moderngl
-import moderngl_window
 from base import CameraWindow
 
+import moderngl_window
+
 
 class CubeModel(CameraWindow):
     aspect_ratio = 16 / 9

examples/cubes.py

@@ -5,10 +5,10 @@
 
 from pathlib import Path
 
+import glm
 import moderngl
-import moderngl_window
 
-import glm
+import moderngl_window
 
 
 class Cubes(moderngl_window.WindowConfig):

examples/custom_config_class.py

@@ -1,5 +1,6 @@
 import math
 import random
+
 import moderngl_window
 from moderngl_window.conf import settings
 from moderngl_window.timers.clock import Timer

examples/custom_config_functions.py

@@ -3,6 +3,7 @@
 """
 import math
 import random
+
 import moderngl_window
 from moderngl_window.conf import settings
 from moderngl_window.timers.clock import Timer

examples/drag_drop_file_input.py

@@ -5,13 +5,13 @@
 
 Currently only working with the Pyglet backend.
 """
-from pathlib import Path
 import os
+from pathlib import Path
 
+import glm
 import moderngl
-import moderngl_window
 
-import glm
+import moderngl_window
 
 
 class Cubes(moderngl_window.WindowConfig):

examples/geometry_bbox.py

@@ -1,10 +1,9 @@
 import glm
+from base import CameraWindow
 
 import moderngl_window
 from moderngl_window import geometry
 
-from base import CameraWindow
-
 
 class GeometryBbox(CameraWindow):
     title = "BBox Geometry"

examples/geometry_cube.py

@@ -1,12 +1,12 @@
 from pathlib import Path
-import glm
 
+import glm
 import moderngl
+from base import CameraWindow
+
 import moderngl_window
 from moderngl_window import geometry
 
-from base import CameraWindow
-
 
 class CubeSimple(CameraWindow):
     title = "Plain Cube"

examples/geometry_cube_instanced.py

@@ -7,12 +7,13 @@
 
 from pathlib import Path
 
-import numpy
 import glm
 import moderngl
+import numpy
+from base import CameraWindow
+
 import moderngl_window
 from moderngl_window import geometry
-from base import CameraWindow
 
 
 class CubeSimpleInstanced(CameraWindow):

examples/geometry_lines.py

@@ -1,10 +1,11 @@
 from pathlib import Path
+
 import glm
+import moderngl
 import numpy
+from base import CameraWindow
 
-import moderngl
 import moderngl_window
-from base import CameraWindow
 
 
 class LinesDemo(CameraWindow):

examples/geometry_quad_fs.py

@@ -1,8 +1,7 @@
 from pathlib import Path
 
 import moderngl_window
-from moderngl_window import geometry
-from moderngl_window import resources
+from moderngl_window import geometry, resources
 
 resources.register_dir((Path(__file__).parent / 'resources').resolve())
 

examples/geometry_quad_fs_mouse_scroll.py

@@ -1,8 +1,7 @@
 from pathlib import Path
 
 import moderngl_window
-from moderngl_window import geometry
-from moderngl_window import resources
+from moderngl_window import geometry, resources
 
 resources.register_dir((Path(__file__).parent / "resources").resolve())
 

examples/gltf_scenes.py

@@ -1,10 +1,11 @@
 from pathlib import Path
-import glm
 
+import glm
 import moderngl
+from base import CameraWindow
+
 import moderngl_window as mglw
 from moderngl_window.scene.camera import KeyboardCamera
-from base import CameraWindow
 
 
 class CubeModel(CameraWindow):

examples/headless.py

@@ -1,6 +1,7 @@
+import moderngl
 import numpy as np
 from PIL import Image
-import moderngl
+
 import moderngl_window
 
 

examples/integration_imgui.py

@@ -1,8 +1,10 @@
 from pathlib import Path
+
+import glm
+import moderngl
 # import imgui
 from imgui_bundle import imgui
-import moderngl
-import glm
+
 import moderngl_window as mglw
 from moderngl_window import geometry
 from moderngl_window.integrations.imgui_bundle import ModernglWindowRenderer

examples/integration_imgui_image.py

@@ -1,9 +1,10 @@
 from pathlib import Path
 
+import glm
+import moderngl
 # import imgui
 from imgui_bundle import imgui
-import moderngl
-import glm
+
 import moderngl_window as mglw
 from moderngl_window import geometry
 from moderngl_window.integrations.imgui_bundle import ModernglWindowRenderer