ruff

Author: JaskRendix

.github/workflows/python-app.yml

@@ -16,24 +16,23 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v6
+      uses: actions/checkout@v4
 
     - name: Set up Python
-      uses: actions/setup-python@v6
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
+        cache: pip
 
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
         pip install ruff pytest
-        pip install pygame-ce pytmx
         pip install .
 
-    - name: Lint with ruff
+    - name: Lint with Ruff
       run: |
-        ruff check .
-        ruff format --check .
+        ruff check --output-format=github .
+        ruff format --check
 
     - name: Run tests
       run: pytest tests

Makefile

@@ -1,6 +1,6 @@
 PACKAGE_NAME := pyscroll
 
-.PHONY: build clean publish install lint format test
+.PHONY: build clean publish install lint fix format test all
 
 build:
 	python3 -m build
@@ -15,8 +15,15 @@ install:
 	pip install -e .
 
 lint:
-	-python -m ruff check . --fix
-	python -m ruff format .
+	ruff check .
+
+fix:
+	ruff check . --fix --unsafe-fixes
+
+format:
+	ruff format .
 
 test:
 	pytest tests/
+
+all: fix format lint

apps/demo/camera_demo.py

@@ -7,6 +7,8 @@
 from pygame.math import Vector2
 from pygame.sprite import Sprite
 from pygame.surface import Surface
+from pytmx.util_pygame import load_pygame  # type: ignore
+
 from pyscroll.camera import (
     BasicCamera,
     CutsceneCamera,
@@ -18,7 +20,6 @@
 from pyscroll.data import MapAggregator, TiledMapData
 from pyscroll.group import PyscrollGroup
 from pyscroll.orthographic import BufferedRenderer
-from pytmx.util_pygame import load_pygame  # type: ignore
 
 CURRENT_DIR = Path(__file__).parent
 RESOURCES_DIR = CURRENT_DIR
@@ -112,9 +113,11 @@ def handle_input(self):
 
                 elif event.key == pygame.locals.K_EQUALS:
                     self.map_layer.zoom += ZOOM_STEP
-                elif event.key == pygame.locals.K_MINUS:
-                    if self.map_layer.zoom - ZOOM_STEP > 0:
-                        self.map_layer.zoom -= ZOOM_STEP
+                elif (
+                    event.key == pygame.locals.K_MINUS
+                    and self.map_layer.zoom - ZOOM_STEP > 0
+                ):
+                    self.map_layer.zoom -= ZOOM_STEP
 
             elif event.type == pygame.locals.VIDEORESIZE:
                 self.screen = pygame.display.set_mode(

apps/demo/demo-stitched.py

@@ -29,11 +29,12 @@
 from pygame.rect import Rect
 from pygame.sprite import Sprite
 from pygame.surface import Surface
+from pytmx.util_pygame import load_pygame  # type: ignore
+
 from pyscroll.camera import FollowCamera
 from pyscroll.data import MapAggregator, TiledMapData
 from pyscroll.group import PyscrollGroup
 from pyscroll.orthographic import BufferedRenderer
-from pytmx.util_pygame import load_pygame  # type: ignore
 
 # define configuration variables here
 CURRENT_DIR = Path(__file__).parent

apps/demo/demo.py

@@ -14,7 +14,6 @@
 import logging
 from collections import deque
 from pathlib import Path
-from typing import Deque
 
 import pygame
 from pygame.font import Font
@@ -34,9 +33,10 @@
 )
 from pygame.math import Vector2
 from pygame.surface import Surface
+from pytmx.util_pygame import load_pygame  # type: ignore
+
 from pyscroll.data import TiledMapData
 from pyscroll.orthographic import BufferedRenderer
-from pytmx.util_pygame import load_pygame  # type: ignore
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
@@ -136,7 +136,7 @@ def update(self, dt: float) -> None:
     def run(self) -> None:
         clock = pygame.time.Clock()
         self.running = True
-        fps_log: Deque[float] = deque(maxlen=20)
+        fps_log: deque[float] = deque(maxlen=20)
 
         while self.running:
             clock.tick(120)

apps/demo/procedural.py

@@ -4,6 +4,7 @@
 # around with. Think of it as a quick visual smoke test rather than a full game.
 
 import pygame
+
 from pyscroll.data import ProceduralData
 from pyscroll.orthographic import BufferedRenderer
 

apps/demo/tile_animation_enhanced.py

@@ -13,6 +13,7 @@
 
 import pygame
 from pygame.locals import QUIT
+
 from pyscroll.animation import AnimationFrame, AnimationToken
 
 

apps/demo/tile_animation_group.py

@@ -15,6 +15,7 @@
 
 import pygame
 from pygame.locals import QUIT
+
 from pyscroll.animation import AnimationFrame, AnimationToken
 
 

apps/demo/tile_animation_simple.py

@@ -12,6 +12,7 @@
 
 import pygame
 from pygame.locals import QUIT
+
 from pyscroll.animation import AnimationFrame, AnimationToken
 
 

apps/demo/translate_buffered.py

@@ -11,9 +11,10 @@
 from pygame.rect import Rect
 from pygame.sprite import Group, Sprite
 from pygame.surface import Surface
+from pytmx.util_pygame import load_pygame  # type: ignore
+
 from pyscroll.data import TiledMapData
 from pyscroll.orthographic import BufferedRenderer
-from pytmx.util_pygame import load_pygame  # type: ignore
 
 # Constants
 RESOURCES_DIR = Path(__file__).parent