diff --git a/Dolphin scripts/Entrance Randomizer/lib/graph_creation.py b/Dolphin scripts/Entrance Randomizer/lib/graph_creation.py index b42fde5..edc9e9e 100644 --- a/Dolphin scripts/Entrance Randomizer/lib/graph_creation.py +++ b/Dolphin scripts/Entrance Randomizer/lib/graph_creation.py @@ -128,8 +128,7 @@ def create_graphml( seed_string: SeedType, starting_area: int, ): - # In Python 3.9 this can be simplified to | - all_transitions = {**transitions_map, **{item: item for item in temp_disabled_exits}} + all_transitions = dict(transitions_map) | {item: item for item in temp_disabled_exits} graphml_text = ( '' diff --git a/Dolphin scripts/Entrance Randomizer/newsfragments/67.removal.md b/Dolphin scripts/Entrance Randomizer/newsfragments/67.removal.md new file mode 100644 index 0000000..87bbc8b --- /dev/null +++ b/Dolphin scripts/Entrance Randomizer/newsfragments/67.removal.md @@ -0,0 +1 @@ +Update expected Python version for the randomizer to `3.11`. This means the Dolphin version has to be at least diff --git a/pyproject.toml b/pyproject.toml index e18c699..5d7f673 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,11 +2,14 @@ # https://github.com/BesLogic/shared-configs/blob/main/ruff.toml # Modifications to this file that are not project-specific should also be done upstream. # These configs were last updated for ruff==0.3.7 + # https://docs.astral.sh/ruff/configuration/ [tool.ruff] line-length = 100 preview = true -target-version = "py38" # Change this to the oldest supported version by your application +# Change this to the oldest supported version by your application +# (same as https://github.com/Felk/dolphin/releases/tag/scripting-preview3 ) +target-version = "py311" # Exclude auto-generated files # exclude = [""] @@ -78,6 +81,12 @@ ignore = [ # False-positives "TCH004", # https://github.com/astral-sh/ruff/issues/3821 + ### + # Conflict with formatter (you can remove this section if you don't use Ruff as a formatter) + ### + # "COM812", # missing-trailing-comma + # "ISC001", # single-line-implicit-string-concatenation + ### # Specific to this project ### @@ -171,9 +180,9 @@ per_file_ignores = ["*.pyi: E302"] # https://github.com/microsoft/pyright/blob/main/docs/configuration.md#sample-pyprojecttoml-file [tool.pyright] -# Minimal python version supported extraPaths = ["Dolphin scripts/typings"] -pythonVersion = "3.8" +# Minimal python version supported (same as https://github.com/Felk/dolphin/releases/tag/scripting-preview3 ) +pythonVersion = "3.11" typeCheckingMode = "strict" # Extra strict reportCallInDefaultInitializer = "error"