Merge branch 'main' into chore/setup-local-dev-env

Author: edoardob90

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
       - id: check-added-large-files
         args: [--maxkb=6000]
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.4
+    rev: v0.12.2
     hooks:
       # Ruff fix
       - id: ruff
@@ -23,7 +23,7 @@ repos:
         types_or: [python, pyi]
         name: ruff (format)
   - repo: https://github.com/google/yamlfmt
-    rev: v0.16.0
+    rev: v0.17.2
     hooks:
       - id: yamlfmt
         name: YAML (format)

pyproject.toml

@@ -37,19 +37,15 @@ dev = [
 [tool.pytest.ini_options]
 addopts = "-v --tb=short"
 
-# Ruff
 [tool.ruff]
 # Line length (Black default)
 line-length = 88
-# Python target version
-target-version = "py310"
 
 # Ignored rules for the entire project
 [tool.ruff.lint]
 ignore = [
   "E501",  # Line too long
   "E203",  # Whitespace before ':'
-  "UP038",  # Use `X | Y` in `isinstance` call instead of `(X, Y)` is deprecated and results in slower code
   # "TRY301", # Raise within try block (this is actually a good practice)
   # "W503"  # Line break before binary operator (not PEP8 enforced, so not implemented in Ruff)
 ]
@@ -86,6 +82,8 @@ select = [
 # but Python by default will raise a TypeError via vars(solution_result)
 # if the result is not a class and therefore doesn't have a __dict__ attribute.
 "tutorial/tests/test_object_oriented_programming.py" = ["B904"]
+# Ignore invalid names like `import torch.nn.functional as F`
+"25_library_pytorch_language_modeling.ipynb" = ["N812"]
 
 # Ruff formatting
 [tool.ruff.format]

tutorial/tests/test_05_object_oriented_programming.py

@@ -38,7 +38,7 @@ def __init__(self, first_name: str, last_name: str):
 
 def validate_oop_person(solution_result):
     assert not isinstance(
-        solution_result, (str, int, float, bool, list, dict, tuple, set)
+        solution_result, str | int | float | bool | list | dict | tuple | set
     ), "Solution must return a class instance, not a datatype."
     assert type(solution_result).__module__ != "builtins", (
         "Solution must return an instance of a custom class, not a built-in type."
@@ -214,7 +214,7 @@ def __eq__(self, other):
 
 def validate_oop_compare_persons(solution_result):
     assert not isinstance(
-        solution_result, (str, int, float, bool, list, dict, tuple, set)
+        solution_result, str | int | float | bool | list | dict | tuple | set
     ), "Solution must return a class instance, not a datatype."
     assert type(solution_result).__module__ != "builtins", (
         "Solution must return an instance of a custom class, not a built-in type."
@@ -280,7 +280,7 @@ def __str__(self):
 
 def validate_ice_cream_scoop(solution_result):
     assert not isinstance(
-        solution_result, (str, int, float, bool, list, dict, tuple, set)
+        solution_result, str | int | float | bool | list | dict | tuple | set
     ), "The returned list must contain class instances, not datatypes."
     assert type(solution_result).__module__ != "builtins", (
         "The returned list must contain instances of a custom class, not a built-in type."
@@ -369,7 +369,7 @@ def __str__(self):
 
 def validate_ice_cream_bowl(solution_result):
     assert not isinstance(
-        solution_result, (str, int, float, bool, list, dict, tuple, set)
+        solution_result, str | int | float | bool | list | dict | tuple | set
     ), "Solution must return a class instance, not a datatype."
     assert type(solution_result).__module__ != "builtins", (
         "Solution must return an instance of a custom class, not a built-in type."
@@ -396,13 +396,13 @@ def validate_ice_cream_bowl(solution_result):
         raise SubAssertionError from None
     assert len(attrs) == 1, "The class should have 1 attribute."
     assert "scoops" in attrs, "The class attribute should be 'scoops'."
-    assert isinstance(solution_result.scoops, (list, set, tuple)), (
+    assert isinstance(solution_result.scoops, list | set | tuple), (
         "The class attribute 'scoops' should be a datatype that acts as a container."
     )
     for scoop in solution_result.scoops:
-        assert not isinstance(scoop, (str, int, float, bool, list, dict, tuple, set)), (
-            "The 'scoops' container must contain class instances, not datatypes."
-        )
+        assert not isinstance(
+            scoop, str | int | float | bool | list | dict | tuple | set
+        ), "The 'scoops' container must contain class instances, not datatypes."
         assert type(scoop).__module__ != "builtins", (
             "The 'scoops' container must contain instances of a custom class, not a built-in type."
         )
@@ -467,7 +467,7 @@ def __le__(self, other):
 
 def validate_ice_cream_shop(solution_result):
     assert not isinstance(
-        solution_result, (str, int, float, bool, list, dict, tuple, set)
+        solution_result, str | int | float | bool | list | dict | tuple | set
     ), "Solution must return a class instance, not a datatype."
     assert type(solution_result).__module__ != "builtins", (
         "Solution must return an instance of a custom class, not a built-in type."
@@ -490,7 +490,7 @@ def validate_ice_cream_shop(solution_result):
         raise SubAssertionError from None
     assert len(attrs) == 1, "The class should have 1 attribute."
     assert "flavors" in attrs, "The class attribute should be 'flavors'."
-    assert isinstance(solution_result.flavors, (list, set, tuple)), (
+    assert isinstance(solution_result.flavors, list | set | tuple), (
         "The class attribute 'flavors' should be a datatype that acts as a container."
     )
 

tutorial/tests/test_13_object_oriented_programming_advanced.py

@@ -40,7 +40,7 @@ def set_eye_color(self):
 
 def validate_child_eye_color(solution_result):
     assert not isinstance(
-        solution_result, (str, int, float, bool, list, dict, tuple, set)
+        solution_result, str | int | float | bool | list | dict | tuple | set
     ), "Solution must return a class instance, not a datatype."
     assert type(solution_result).__module__ != "builtins", (
         "Solution must return an instance of a custom class, not a built-in type."

tutorial/tests/testsuite/ast_parser.py

@@ -19,9 +19,9 @@ def __init__(self, module_file: pathlib.Path) -> None:
         tree = ast.parse(self.module_file.read_text(encoding="utf-8"))
 
         for node in tree.body:
-            if isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef)):
+            if isinstance(node, ast.FunctionDef | ast.AsyncFunctionDef):
                 self.function_defs[node.name] = node
-            elif isinstance(node, (ast.Import, ast.ImportFrom)) and hasattr(
+            elif isinstance(node, ast.Import | ast.ImportFrom) and hasattr(
                 node, "module"
             ):
                 for n in node.names:
@@ -83,7 +83,7 @@ def get_solution_code(self, name: str) -> str:
                     )
                     for node in function_file_tree.body:
                         if (
-                            isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef))
+                            isinstance(node, ast.FunctionDef | ast.AsyncFunctionDef)
                             and node.name == f
                         ):
                             solution_code += ast.unparse(node) + "\n\n"