Upgrade linters and switch to Ruff (realpython#530)

* Update Python, Black, and Flake8 versions

* Black 24 updates

* Switch from Flake8 to Ruff for linting

* Ruff fixes

* Add information about Ruff in README

* Black

---------

Co-authored-by: Dan Bader <[email protected]>

.github/workflows/dircheck.py

@@ -1,6 +1,7 @@
 """
 Linter to ensure standard folder structure
 """
+
 import pathlib
 import re
 import sys

.github/workflows/linters.yml

@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - {name: Linux311, python: '3.11.5', os: ubuntu-latest}
+          - {name: Linux312, python: '3.12.3', os: ubuntu-latest}
     steps:
     - name: Check out repository
       uses: actions/checkout@v2
@@ -48,7 +48,7 @@ jobs:
     - name: Check code style
       run: |
         . venv/bin/activate
-        python -m flake8
+        python -m ruff check .
         python -m black --check .
 
     - name: Check directory layout

README.md

@@ -15,12 +15,12 @@ Due to time constraints, we cannot provide 1:1 support via GitHub. See you on Sl
 
 ### Running Code Style Checks
 
-We use [flake8](http://flake8.pycqa.org/en/latest/) and [black](https://black.readthedocs.io/) to ensure a consistent code style for all of our sample code in this repository.
+We use [ruff](https://docs.astral.sh/ruff/) and [black](https://black.readthedocs.io/) to ensure a consistent code style for all of our sample code in this repository.
 
 Run the following commands to validate your code against the linters:
 
 ```sh
-$ flake8
+$ ruff check .
 $ black --check .
 ```
 

arcade-a-primer/arcade_game.py

@@ -2,9 +2,10 @@
 #
 
 # Imports
-import arcade
 import random
 
+import arcade
+
 # Constants
 SCREEN_WIDTH = 800
 SCREEN_HEIGHT = 600

arcade-platformer/arcade_platformer/02_open_game_window.py

@@ -8,9 +8,10 @@
 Game sounds and tile maps by author
 """
 
-import arcade
 import pathlib
 
+import arcade
+
 # Game constants
 # Window dimensions
 SCREEN_WIDTH = 1000

arcade-platformer/arcade_platformer/03_read_level_one.py

@@ -8,9 +8,10 @@
 Game sounds and tile maps by author
 """
 
-import arcade
 import pathlib
 
+import arcade
+
 # Game constants
 # Window dimensions
 SCREEN_WIDTH = 1000

arcade-platformer/arcade_platformer/04_define_player.py

@@ -8,9 +8,10 @@
 Game sounds and tile maps by author
 """
 
-import arcade
 import pathlib
 
+import arcade
+
 # Game constants
 # Window dimensions
 SCREEN_WIDTH = 1000

arcade-platformer/arcade_platformer/05_update_and_draw.py

@@ -8,9 +8,10 @@
 Game sounds and tile maps by author
 """
 
-import arcade
 import pathlib
 
+import arcade
+
 # Game constants
 # Window dimensions
 SCREEN_WIDTH = 1000

arcade-platformer/arcade_platformer/06_keyboard_movement.py

@@ -8,9 +8,10 @@
 Game sounds and tile maps by author
 """
 
-import arcade
 import pathlib
 
+import arcade
+
 # Game constants
 # Window dimensions
 SCREEN_WIDTH = 1000

arcade-platformer/arcade_platformer/07_scrolling_view.py

@@ -8,9 +8,10 @@
 Game sounds and tile maps by author
 """
 
-import arcade
 import pathlib
 
+import arcade
+
 # Game constants
 # Window dimensions
 SCREEN_WIDTH = 1000

arcade-platformer/arcade_platformer/08_on_screen_score.py

@@ -8,9 +8,10 @@
 Game sounds and tile maps by author
 """
 
-import arcade
 import pathlib
 
+import arcade
+
 # Game constants
 # Window dimensions
 SCREEN_WIDTH = 1000

arcade-platformer/arcade_platformer/09_joystick_control.py

@@ -8,9 +8,10 @@
 Game sounds and tile maps by author
 """
 
-import arcade
 import pathlib
 
+import arcade
+
 # Game constants
 # Window dimensions
 SCREEN_WIDTH = 1000

arcade-platformer/arcade_platformer/10_view_conversion.py

@@ -8,9 +8,10 @@
 Game sounds and tile maps by author
 """
 
-import arcade
 import pathlib
 
+import arcade
+
 # Game constants
 # Window dimensions
 SCREEN_WIDTH = 1000

arcade-platformer/arcade_platformer/11_title_view.py

@@ -8,9 +8,10 @@
 Game sounds and tile maps by author
 """
 
-import arcade
 import pathlib
 
+import arcade
+
 # Game constants
 # Window dimensions
 SCREEN_WIDTH = 1000

arcade-platformer/arcade_platformer/12_instructions_view.py

@@ -8,9 +8,10 @@
 Game sounds and tile maps by author
 """
 
-import arcade
 import pathlib
 
+import arcade
+
 # Game constants
 # Window dimensions
 SCREEN_WIDTH = 1000

arcade-platformer/arcade_platformer/13_pause_view.py

@@ -8,9 +8,10 @@
 Game sounds and tile maps by author
 """
 
-import arcade
 import pathlib
 
+import arcade
+
 # Game constants
 # Window dimensions
 SCREEN_WIDTH = 1000

arcade-platformer/arcade_platformer/14_enemies.py

@@ -8,9 +8,10 @@
 Game sounds and tile maps by author
 """
 
-import arcade
 import pathlib
 
+import arcade
+
 # Game constants
 # Window dimensions
 SCREEN_WIDTH = 1000

arcade-platformer/arcade_platformer/15_moving_platforms.py

@@ -8,9 +8,10 @@
 Game sounds and tile maps by author
 """
 
-import arcade
 import pathlib
 
+import arcade
+
 # Game constants
 # Window dimensions
 SCREEN_WIDTH = 1000

arcade-platformer/arcade_platformer/arcade_platformer.py

@@ -8,8 +8,9 @@
 Game sounds and tile maps by author
 """
 
-import arcade
 import pathlib
+
+import arcade
 import constants as game
 
 # Assets path

asterioids-pygame-project/source_code_final/space_rocks/__main__.py

@@ -1,6 +1,5 @@
 from game import SpaceRocks
 
-
 if __name__ == "__main__":
     space_rocks = SpaceRocks()
     space_rocks.main_loop()

asterioids-pygame-project/source_code_final/space_rocks/game.py

@@ -1,5 +1,4 @@
 import pygame
-
 from models import Asteroid, Spaceship
 from utils import get_random_position, load_sprite, print_text
 

asterioids-pygame-project/source_code_final/space_rocks/models.py

@@ -1,6 +1,5 @@
 from pygame.math import Vector2
 from pygame.transform import rotozoom
-
 from utils import get_random_velocity, load_sound, load_sprite, wrap_position
 
 UP = Vector2(0, -1)

asterioids-pygame-project/source_code_step_1/space_rocks/__main__.py

@@ -1,6 +1,5 @@
 from game import SpaceRocks
 
-
 if __name__ == "__main__":
     space_rocks = SpaceRocks()
     space_rocks.main_loop()

asterioids-pygame-project/source_code_step_10/space_rocks/__main__.py

@@ -1,6 +1,5 @@
 from game import SpaceRocks
 
-
 if __name__ == "__main__":
     space_rocks = SpaceRocks()
     space_rocks.main_loop()

asterioids-pygame-project/source_code_step_10/space_rocks/game.py

@@ -1,5 +1,4 @@
 import pygame
-
 from models import Asteroid, Spaceship
 from utils import get_random_position, load_sprite, print_text
 

asterioids-pygame-project/source_code_step_10/space_rocks/models.py

@@ -1,6 +1,5 @@
 from pygame.math import Vector2
 from pygame.transform import rotozoom
-
 from utils import get_random_velocity, load_sound, load_sprite, wrap_position
 
 UP = Vector2(0, -1)

asterioids-pygame-project/source_code_step_2/space_rocks/__main__.py

@@ -1,6 +1,5 @@
 from game import SpaceRocks
 
-
 if __name__ == "__main__":
     space_rocks = SpaceRocks()
     space_rocks.main_loop()

asterioids-pygame-project/source_code_step_3/space_rocks/__main__.py

@@ -1,6 +1,5 @@
 from game import SpaceRocks
 
-
 if __name__ == "__main__":
     space_rocks = SpaceRocks()
     space_rocks.main_loop()

asterioids-pygame-project/source_code_step_3/space_rocks/game.py

@@ -1,5 +1,4 @@
 import pygame
-
 from utils import load_sprite
 
 

asterioids-pygame-project/source_code_step_4/space_rocks/__main__.py

@@ -1,6 +1,5 @@
 from game import SpaceRocks
 
-
 if __name__ == "__main__":
     space_rocks = SpaceRocks()
     space_rocks.main_loop()

asterioids-pygame-project/source_code_step_4/space_rocks/game.py

@@ -1,5 +1,4 @@
 import pygame
-
 from models import GameObject
 from utils import load_sprite
 

asterioids-pygame-project/source_code_step_5/space_rocks/__main__.py

@@ -1,6 +1,5 @@
 from game import SpaceRocks
 
-
 if __name__ == "__main__":
     space_rocks = SpaceRocks()
     space_rocks.main_loop()

asterioids-pygame-project/source_code_step_5/space_rocks/game.py

@@ -1,5 +1,4 @@
 import pygame
-
 from models import Spaceship
 from utils import load_sprite
 

asterioids-pygame-project/source_code_step_5/space_rocks/models.py

@@ -1,6 +1,5 @@
 from pygame.math import Vector2
 from pygame.transform import rotozoom
-
 from utils import load_sprite, wrap_position
 
 UP = Vector2(0, -1)

asterioids-pygame-project/source_code_step_6/space_rocks/__main__.py

@@ -1,6 +1,5 @@
 from game import SpaceRocks
 
-
 if __name__ == "__main__":
     space_rocks = SpaceRocks()
     space_rocks.main_loop()

asterioids-pygame-project/source_code_step_6/space_rocks/game.py

@@ -1,5 +1,4 @@
 import pygame
-
 from models import Asteroid, Spaceship
 from utils import get_random_position, load_sprite
 

asterioids-pygame-project/source_code_step_6/space_rocks/models.py

@@ -1,6 +1,5 @@
 from pygame.math import Vector2
 from pygame.transform import rotozoom
-
 from utils import get_random_velocity, load_sprite, wrap_position
 
 UP = Vector2(0, -1)

asterioids-pygame-project/source_code_step_7/space_rocks/__main__.py

@@ -1,6 +1,5 @@
 from game import SpaceRocks
 
-
 if __name__ == "__main__":
     space_rocks = SpaceRocks()
     space_rocks.main_loop()

asterioids-pygame-project/source_code_step_7/space_rocks/game.py

@@ -1,5 +1,4 @@
 import pygame
-
 from models import Asteroid, Spaceship
 from utils import get_random_position, load_sprite
 

asterioids-pygame-project/source_code_step_7/space_rocks/models.py

@@ -1,6 +1,5 @@
 from pygame.math import Vector2
 from pygame.transform import rotozoom
-
 from utils import get_random_velocity, load_sprite, wrap_position
 
 UP = Vector2(0, -1)

asterioids-pygame-project/source_code_step_8/space_rocks/__main__.py

@@ -1,6 +1,5 @@
 from game import SpaceRocks
 
-
 if __name__ == "__main__":
     space_rocks = SpaceRocks()
     space_rocks.main_loop()

asterioids-pygame-project/source_code_step_8/space_rocks/game.py

@@ -1,5 +1,4 @@
 import pygame
-
 from models import Asteroid, Spaceship
 from utils import get_random_position, load_sprite
 

asterioids-pygame-project/source_code_step_8/space_rocks/models.py

@@ -1,6 +1,5 @@
 from pygame.math import Vector2
 from pygame.transform import rotozoom
-
 from utils import get_random_velocity, load_sprite, wrap_position
 
 UP = Vector2(0, -1)

asterioids-pygame-project/source_code_step_9/space_rocks/__main__.py

@@ -1,6 +1,5 @@
 from game import SpaceRocks
 
-
 if __name__ == "__main__":
     space_rocks = SpaceRocks()
     space_rocks.main_loop()