Upgrade to pyton 3.10 (#2677)

* enable pyupgrade for ruff, migrate to 3.10 featured typing

* fix arcade python version warning (req 3.10

* fix formating

* revert arcade.gl changes to reduce merge issues for gl abstraction PR

Author: eruvanos

arcade/__init__.py

@@ -12,8 +12,8 @@
 
 from pathlib import Path
 
-if sys.version_info[0] < 3 or (sys.version_info[0] == 3 and sys.version_info[1] < 9):
-    sys.exit("The Arcade Library requires Python 3.9 or higher.")
+if sys.version_info[0] < 3 or (sys.version_info[0] == 3 and sys.version_info[1] < 10):
+    sys.exit("The Arcade Library requires Python 3.10 or higher.")
 
 
 def configure_logging(level: int | None = None):

arcade/application.py

@@ -8,7 +8,8 @@
 import logging
 import os
 import time
-from typing import TYPE_CHECKING, Sequence
+from collections.abc import Sequence
+from typing import TYPE_CHECKING
 
 import pyglet
 import pyglet.gl as gl
@@ -36,7 +37,7 @@
 MOUSE_BUTTON_MIDDLE = 2
 MOUSE_BUTTON_RIGHT = 4
 
-_window: "Window"
+_window: Window
 
 __all__ = [
     "get_screens",

arcade/cache/hit_box.py

@@ -118,7 +118,7 @@ def load(self, path: str | Path) -> None:
             with gzip.open(path, mode="rb") as fd:
                 data = json.loads(fd.read())
         else:
-            with open(path, mode="r") as fd:
+            with open(path) as fd:
                 data = json.loads(fd.read())
 
         for key, value in data.items():

arcade/cache/image_data.py

@@ -23,9 +23,9 @@ class ImageDataCache:
     """
 
     def __init__(self):
-        self._entries: dict[str, "ImageData"] = {}
+        self._entries: dict[str, ImageData] = {}
 
-    def put(self, name: str, image: "ImageData"):
+    def put(self, name: str, image: ImageData):
         """
         Add an image to the cache.
 

arcade/camera/camera_2d.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
+from collections.abc import Generator
 from contextlib import contextmanager
 from math import atan2, cos, degrees, radians, sin
-from typing import TYPE_CHECKING, Generator
+from typing import TYPE_CHECKING
 
 from pyglet.math import Vec2, Vec3
 from typing_extensions import Self
@@ -223,12 +224,12 @@ def from_camera_data(
             left, right = projection_data.left, projection_data.right
             if projection_data.left == projection_data.right:
                 raise ZeroProjectionDimension(
-                    (f"projection width is 0 due to equal {left=}and {right=} values")
+                    f"projection width is 0 due to equal {left=}and {right=} values"
                 )
             bottom, top = projection_data.bottom, projection_data.top
             if bottom == top:
                 raise ZeroProjectionDimension(
-                    (f"projection height is 0 due to equal {bottom=}and {top=}")
+                    f"projection height is 0 due to equal {bottom=}and {top=}"
                 )
             near, far = projection_data.near, projection_data.far
             if near == far:
@@ -583,7 +584,7 @@ def projection(self) -> Rect:
     def projection(self, value: Rect) -> None:
         # Unpack and validate
         if not value:
-            raise ZeroProjectionDimension((f"Projection area is 0, {value.lrbt}"))
+            raise ZeroProjectionDimension(f"Projection area is 0, {value.lrbt}")
 
         _z = self._camera_data.zoom
 

arcade/camera/data_types.py

@@ -4,8 +4,9 @@
 wide usage throughout Arcade's camera code.
 """
 
+from collections.abc import Generator
 from contextlib import contextmanager
-from typing import Final, Generator, Protocol
+from typing import Final, Protocol
 
 from pyglet.math import Vec2, Vec3
 from typing_extensions import Self

arcade/camera/default.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
+from collections.abc import Generator
 from contextlib import contextmanager
-from typing import TYPE_CHECKING, Generator
+from typing import TYPE_CHECKING
 
 from pyglet.math import Mat4, Vec2, Vec3
 from typing_extensions import Self

arcade/camera/orthographic.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
+from collections.abc import Generator
 from contextlib import contextmanager
-from typing import TYPE_CHECKING, Generator
+from typing import TYPE_CHECKING
 
 from pyglet.math import Mat4, Vec2, Vec3
 from typing_extensions import Self

arcade/camera/perspective.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
+from collections.abc import Generator
 from contextlib import contextmanager
 from math import radians, tan
-from typing import TYPE_CHECKING, Generator
+from typing import TYPE_CHECKING
 
 from pyglet.math import Mat4, Vec2, Vec3
 from typing_extensions import Self

arcade/camera/static.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
+from collections.abc import Callable, Generator
 from contextlib import contextmanager
-from typing import TYPE_CHECKING, Callable, Generator
+from typing import TYPE_CHECKING
 
 from pyglet.math import Mat4, Vec2, Vec3