Update linters

.github/dependabot.yml

@@ -6,5 +6,4 @@ updates:
     interval: monthly
   open-pull-requests-limit: 10
   allow:
-  - dependency-name: flake8
-  - dependency-name: black
+  - dependency-name: ruff

.github/workflows/linters.yml

@@ -4,7 +4,7 @@
 # https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json
 
 name: linters
-on: 
+on:
   push:
     branches:
       - master
@@ -18,12 +18,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - {name: Linux312, python: '3.12.3', os: ubuntu-latest}
+          - {name: Linux313, python: '3.13.7', os: ubuntu-latest}
     steps:
     - name: Check out repository
       uses: actions/checkout@v2
 
-    - name: Set up Python 
+    - name: Set up Python
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python }}
@@ -48,8 +48,8 @@ jobs:
     - name: Check code style
       run: |
         . venv/bin/activate
-        python -m ruff check .
-        python -m black --check .
+        python -m ruff format --check
+        python -m ruff check
 
     - name: Check directory layout
       run: |

README.md

@@ -15,23 +15,26 @@ Due to time constraints, we cannot provide 1:1 support via GitHub. See you on Sl
 
 ### Running Code Style Checks
 
-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.
+We use [Ruff](https://realpython.com/ruff-python/) to ensure a consistent code style and formatting for all of our sample code in this repository.
 
 Run the following commands to validate your code against the linters:
 
 ```sh
-$ ruff check .
-$ black --check .
+$ ruff format --check
+$ ruff check
 ```
 
+Make sure you're using the exact Ruff version specified in [`requirements.txt`](https://github.com/realpython/materials/blob/master/requirements.txt).
+
 ### Running Python Code Formatter
 
-We're using a tool called [black](https://black.readthedocs.io/) on this repo to ensure consistent formatting. On CI it runs in "check" mode to ensure any new files added to the repo follow PEP 8. If you see linter warnings that say something like "would reformat some_file.py" it means that black disagrees with your formatting.
+Ruff can automatically ensure a consistent code formatting in this repository. On CI, it runs in "check" mode to ensure any new files added to the repo follow [PEP 8](https://realpython.com/python-pep8/). If you see linter warnings that say something like "would reformat some_file.py", then it means that Ruff disagrees with your formatting.
 
-**The easiest way to resolve these errors is to run Black locally on the code and then commit those changes, as explained below.**
+The easiest way to resolve these errors is to run Ruff locally on the code and then commit those changes, as explained below.
 
-To automatically re-format your code to be consistent with our code style guidelines, run [black](https://black.readthedocs.io/) in the repository root folder:
+To automatically reformat your code to be consistent with our code style guidelines, run [Ruff](https://pypi.org/project/ruff/) in the repository root folder:
 
 ```sh
-$ black .
+$ ruff format
+$ ruff check --fix
 ```

advent-of-code/solutions/2021/05_hydrothermal_venture/aoc202105.py

@@ -63,7 +63,10 @@ def points(line):
         case (x1, y1, x2, y2) if y1 == y2:
             return [(x, y1) for x in coords(x1, x2)]
         case (x1, y1, x2, y2):
-            return [(x, y) for x, y in zip(coords(x1, x2), coords(y1, y2))]
+            return [
+                (x, y)
+                for x, y in zip(coords(x1, x2), coords(y1, y2), strict=False)
+            ]
 
 
 def coords(start, stop):

arcade-platformer/arcade_platformer/11_title_view.py

@@ -74,7 +74,6 @@ def on_update(self, delta_time: float) -> None:
 
         # If the timer has run out, we toggle the instructions
         if self.display_timer < 0:
-
             # Toggle whether to show the instructions
             self.show_instructions = not self.show_instructions
 

arcade-platformer/arcade_platformer/12_instructions_view.py

@@ -74,7 +74,6 @@ def on_update(self, delta_time: float) -> None:
 
         # If the timer has run out, we toggle the instructions
         if self.display_timer < 0:
-
             # Toggle whether to show the instructions
             self.show_instructions = not self.show_instructions
 

arcade-platformer/arcade_platformer/13_pause_view.py

@@ -74,7 +74,6 @@ def on_update(self, delta_time: float) -> None:
 
         # If the timer has run out, we toggle the instructions
         if self.display_timer < 0:
-
             # Toggle whether to show the instructions
             self.show_instructions = not self.show_instructions
 

arcade-platformer/arcade_platformer/14_enemies.py

@@ -116,7 +116,6 @@ def on_update(self, delta_time: float) -> None:
 
         # If the timer has run out, we toggle the instructions
         if self.display_timer < 0:
-
             # Toggle whether to show the instructions
             self.show_instructions = not self.show_instructions
 

arcade-platformer/arcade_platformer/15_moving_platforms.py

@@ -116,7 +116,6 @@ def on_update(self, delta_time: float) -> None:
 
         # If the timer has run out, we toggle the instructions
         if self.display_timer < 0:
-
             # Toggle whether to show the instructions
             self.show_instructions = not self.show_instructions
 

arcade-platformer/arcade_platformer/arcade_platformer.py

@@ -91,7 +91,6 @@ def on_update(self, delta_time: float) -> None:
 
         # If the timer has run out, we toggle the instructions
         if self.display_timer < 0:
-
             # Toggle whether to show the instructions
             self.show_instructions = not self.show_instructions
 

asyncio-walkthrough/asyncq.py

@@ -42,9 +42,7 @@ async def consume(name: int, q: asyncio.Queue) -> None:
         await randsleep(caller=f"Consumer {name}")
         i, t = await q.get()
         now = await seconds()
-        print(
-            f"Consumer {name} got element <{i}>" f" in {now-t:0.5f} seconds."
-        )
+        print(f"Consumer {name} got element <{i}> in {now - t:0.5f} seconds.")
         q.task_done()
 
 

brython/sha256/main.py

@@ -24,8 +24,7 @@ def compute(evt):
         return
     if value in hash_map:
         alert(
-            f"The SHA-256 value of '{value}' "
-            f"already exists: '{hash_map[value]}'"
+            f"The SHA-256 value of '{value}' already exists: '{hash_map[value]}'"
         )
         return
     hash = hashlib.sha256()

build-a-blog-from-scratch-django/django-blog/blog/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.2.4 on 2023-08-29 12:43
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

build-a-blog-from-scratch-django/django-blog/manage.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 """Django's command-line utility for administrative tasks."""
+
 import os
 import sys
 

build-a-django-content-aggregator/source_code_final/manage.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 """Django's command-line utility for administrative tasks."""
+
 import os
 import sys
 

build-a-django-content-aggregator/source_code_step_1/manage.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 """Django's command-line utility for administrative tasks."""
+
 import os
 import sys
 

build-a-django-content-aggregator/source_code_step_2/manage.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 """Django's command-line utility for administrative tasks."""
+
 import os
 import sys
 

build-a-django-content-aggregator/source_code_step_3/manage.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 """Django's command-line utility for administrative tasks."""
+
 import os
 import sys
 

build-a-django-content-aggregator/source_code_step_4/manage.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 """Django's command-line utility for administrative tasks."""
+
 import os
 import sys
 

build-a-django-content-aggregator/source_code_step_5/manage.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 """Django's command-line utility for administrative tasks."""
+
 import os
 import sys
 

build-a-django-content-aggregator/source_code_step_6/manage.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 """Django's command-line utility for administrative tasks."""
+
 import os
 import sys
 

build-a-django-content-aggregator/source_code_step_7/manage.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 """Django's command-line utility for administrative tasks."""
+
 import os
 import sys
 

build-a-web-scraper/04_pipeline.ipynb

@@ -29,10 +29,7 @@
    "execution_count": 1,
    "metadata": {},
    "outputs": [],
-   "source": [
-    "import requests\n",
-    "from bs4 import BeautifulSoup"
-   ]
+   "source": []
   },
   {
    "cell_type": "markdown",

celery-async-tasks/source_code_final/manage.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 """Django's command-line utility for administrative tasks."""
+
 import os
 import sys
 

celery-async-tasks/source_code_initial/manage.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 """Django's command-line utility for administrative tasks."""
+
 import os
 import sys
 

chatgpt-mentor/fizzbuzz_chatgpt_option_2.py

@@ -3,7 +3,11 @@ def fizzbuzz(n):
         (
             "fizz buzz"
             if i % 15 == 0
-            else "fizz" if i % 3 == 0 else "buzz" if i % 5 == 0 else i
+            else "fizz"
+            if i % 3 == 0
+            else "buzz"
+            if i % 5 == 0
+            else i
         )
         for i in range(1, n + 1)
     ]

chatgpt-mentor/fizzbuzz_chatgpt_option_3.py

@@ -3,7 +3,11 @@ def fizzbuzz(n):
         (
             "fizz buzz"
             if i % 15 == 0
-            else "fizz" if i % 3 == 0 else "buzz" if i % 5 == 0 else i
+            else "fizz"
+            if i % 3 == 0
+            else "buzz"
+            if i % 5 == 0
+            else i
         )
         for i in range(1, n + 1)
     )

chatgpt-unit-tests-python/test_fizzbuzz_pytest.py

@@ -35,6 +35,6 @@
     ],
 )
 def test_fizzbuzz(input, expected):
-    assert (
-        fizzbuzz(input) == expected
-    ), f"Expected {expected} for input {input}"
+    assert fizzbuzz(input) == expected, (
+        f"Expected {expected} for input {input}"
+    )

chatterbot/source_code_final/bot.py

@@ -1,7 +1,7 @@
+from chatterbot.trainers import ListTrainer
 from cleaner import clean_corpus
 
 from chatterbot import ChatBot
-from chatterbot.trainers import ListTrainer
 
 CORPUS_FILE = "chat.txt"
 

chatterbot/source_code_step_2/bot.py

@@ -1,6 +1,7 @@
-from chatterbot import ChatBot
 from chatterbot.trainers import ListTrainer
 
+from chatterbot import ChatBot
+
 chatbot = ChatBot("Chatpot")
 
 trainer = ListTrainer(chatbot)

chatterbot/source_code_step_3/bot.py

@@ -1,6 +1,7 @@
-from chatterbot import ChatBot
 from chatterbot.trainers import ListTrainer
 
+from chatterbot import ChatBot
+
 chatbot = ChatBot("Chatpot")
 
 trainer = ListTrainer(chatbot)

chatterbot/source_code_step_4/bot.py

@@ -1,6 +1,7 @@
-from chatterbot import ChatBot
 from chatterbot.trainers import ListTrainer
 
+from chatterbot import ChatBot
+
 chatbot = ChatBot("Chatpot")
 
 trainer = ListTrainer(chatbot)

chatterbot/source_code_step_5/bot.py

@@ -1,7 +1,7 @@
+from chatterbot.trainers import ListTrainer
 from cleaner import clean_corpus
 
 from chatterbot import ChatBot
-from chatterbot.trainers import ListTrainer
 
 CORPUS_FILE = "chat.txt"
 

complex-numbers/bermuda.ipynb

@@ -25,7 +25,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from ipywidgets import interact, IntSlider, FloatSlider"
+    "from ipywidgets import FloatSlider, IntSlider, interact"
    ]
   },
   {
@@ -66,7 +66,7 @@
     "    plt.plot(x, y, \"o\", color=stroke)\n",
     "    plt.gca().add_patch(\n",
     "        plt.Polygon(\n",
-    "            list(zip(x, y)),\n",
+    "            list(zip(x, y, strict=False)),\n",
     "            facecolor=fill,\n",
     "            edgecolor=stroke,\n",
     "            alpha=0.5,\n",

complex-numbers/fourier.ipynb

@@ -89,8 +89,8 @@
     }
    ],
    "source": [
-    "from ipywidgets import interact, FloatSlider\n",
     "from IPython.display import Audio, display\n",
+    "from ipywidgets import FloatSlider, interact\n",
     "\n",
     "tone = None\n",
     "\n",
@@ -168,7 +168,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from cmath import pi, exp\n",
+    "from cmath import exp, pi\n",
     "\n",
     "\n",
     "def discrete_fourier_transform(x, k):\n",

consuming-apis-python/github.py

@@ -77,8 +77,7 @@ def print_user_info(access_token=None):
     username = response["login"]
     private_repos_count = response["total_private_repos"]
     print(
-        f"{name} ({username}) | "
-        f"number of private repositories: {private_repos_count}"
+        f"{name} ({username}) | number of private repositories: {private_repos_count}"
     )
 
 

data-analysis/data_analysis_findings.ipynb

@@ -958,9 +958,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from sklearn.linear_model import LinearRegression\n",
     "import matplotlib.pyplot as plt\n",
-    "\n",
     "from sklearn.linear_model import LinearRegression\n",
     "\n",
     "x = data.loc[:, [\"imdb\"]]\n",