Switch to ruff (#449)

Author: rhysyngsun

.github/workflows/ci.yml

@@ -16,11 +16,8 @@ jobs:
       - name: Install dependencies
         run: uv sync
 
-      - name: Lint
-        run: uv run pylint *.py
-
-      - name: Black
-        run: uv run black --version && uv run black . --check
+      - name: Ruff
+        run: uv run ruff check
 
       - name: Tests
         run: uv run pytest .

bot.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
-# pylint: disable=too-many-lines
+
 """Slack bot for managing releases"""
+
 import asyncio
 from asyncio import sleep as async_sleep  # importing separately for simpler mocking
 from collections import namedtuple
@@ -118,7 +119,6 @@ def get_envs():
     return env_dict
 
 
-# pylint: disable=too-many-instance-attributes,too-many-arguments,too-many-public-methods
 class Bot:
     """Slack bot used to manage the release"""
 
@@ -179,7 +179,7 @@ async def translate_slack_usernames(self, names):
             slack_users = await self.lookup_users()
             return {match_user(slack_users, author) for author in names}
 
-        except:  # pylint: disable=bare-except
+        except:  # noqa: E722
             log.exception(
                 "Exception during translate_slack_usernames, continuing with untranslated names..."
             )
@@ -982,7 +982,7 @@ async def commits_since_last_release(self, command_args):
                 ],
             )
 
-    async def start_new_releases(self, command_args):  # pylint: disable=too-many-locals
+    async def start_new_releases(self, command_args):
         """
         Start new releases for all projects with new commits
 
@@ -1314,7 +1314,6 @@ def make_commands(self):
             ),
         ]
 
-    # pylint: disable=too-many-locals
     async def run_command(self, *, manager, channel_id, words):
         """
         Run a command
@@ -1339,7 +1338,7 @@ async def run_command(self, *, manager, channel_id, words):
                 for arg, parser in zip(args, command.parsers):
                     try:
                         parsed_args.append(parser.func(arg))
-                    except:  # pylint: disable=bare-except
+                    except:  # noqa: E722
                         await self.say(
                             channel_id=channel_id,
                             text=(
@@ -1403,7 +1402,7 @@ async def handle_message(self, *, manager, channel_id, words):
         except (InputException, ReleaseException) as ex:
             log.exception("A BotException was raised:")
             await self.say(channel_id=channel_id, text=f"Oops! {ex}")
-        except:  # pylint: disable=bare-except
+        except:  # noqa: E722
             log.exception("Exception found when handling a message")
             await self.say(
                 channel_id=channel_id,

bot_local.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 """Run the bot locally to test it out"""
+
 import asyncio
 import sys
 
@@ -14,9 +15,7 @@
 class ConsoleBot(Bot):
     """Fake console bot"""
 
-    async def say(
-        self, *, channel_id, text="", attachments=None, message_type=""
-    ):  # pylint: disable=unused-argument
+    async def say(self, *, channel_id, text="", attachments=None, message_type=""):
         """Print messages to stdout"""
         attachment_text = ""
         if attachments is not None:

bot_local_test.py

@@ -8,7 +8,6 @@
 pytestmark = pytest.mark.asyncio
 
 
-# pylint: disable=unused-argument
 async def test_bot_local(mocker, test_repo):
     """
     bot_local should execute a command

bot_test.py

@@ -46,7 +46,6 @@
 NPM_TOKEN = "npm-token"
 
 
-# pylint: disable=redefined-outer-name, too-many-lines
 class DoofSpoof(Bot):
     """Testing bot"""
 
@@ -129,7 +128,7 @@ def sleep_sync_mock(mocker):
 
 
 @pytest.fixture
-def doof(sleep_sync_mock):  # pylint: disable=unused-argument
+def doof(sleep_sync_mock):
     """Create a Doof"""
     yield DoofSpoof()
 
@@ -140,11 +139,11 @@ def mock_labels(mocker):
 
     _label = None
 
-    def _set_label(*args, label, **kwargs):  # pylint: disable=unused-argument
+    def _set_label(*args, label, **kwargs):
         nonlocal _label
         _label = label
 
-    def _get_label(*args, **kwargs):  # pylint: disable=unused-argument
+    def _get_label(*args, **kwargs):
         return _label
 
     mock_set = mocker.async_patch("bot.set_release_label", side_effect=_set_label)
@@ -392,11 +391,8 @@ async def test_hash(doof, test_repo, mocker, deployment_server_type, expected_ur
     )
 
 
-# pylint: disable=too-many-locals
 @pytest.mark.parametrize("command", ["release", "start release"])
-async def test_release(
-    doof, test_repo, mocker, command, mock_labels
-):  # pylint: disable=unused-argument
+async def test_release(doof, test_repo, mocker, command, mock_labels):
     """
     Doof should do a release when asked
     """
@@ -453,10 +449,9 @@ async def test_release(
     assert wait_for_checkboxes_sync_mock.called is True
 
 
-# pylint: disable=too-many-locals
 async def test_hotfix_release(
     doof, test_repo, test_repo_directory, mocker, mock_labels
-):  # pylint: disable=unused-argument
+):
     """
     Doof should do a hotfix when asked
     """
@@ -643,9 +638,7 @@ async def test_release_library(doof, library_test_repo, mocker):
 
 
 @pytest.mark.parametrize("project_type", [WEB_APPLICATION_TYPE, LIBRARY_TYPE])
-async def test_finish_release(
-    doof, mocker, project_type, mock_labels
-):  # pylint: disable=unused-argument
+async def test_finish_release(doof, mocker, project_type, mock_labels):
     """
     Doof should finish a release when asked
     """
@@ -736,10 +729,9 @@ async def test_webhook_different_callback_id(doof, mocker):
     assert finish_release_mock.called is False
 
 
-# pylint: disable=too-many-arguments
 async def test_webhook_finish_release(
     doof, mocker, test_repo, library_test_repo, mock_labels
-):  # pylint: disable=unused-argument
+):
     """
     Finish the release
     """
@@ -965,7 +957,7 @@ async def test_publish(doof, library_test_repo, mocker, packaging_tool):
         ["wait for checkboxes", LIBRARY_TYPE],
         ["publish 1.2.3", WEB_APPLICATION_TYPE],
     ],
-)  # pylint: disable=too-many-arguments
+)
 async def test_invalid_project_type(
     doof, test_repo, library_test_repo, command, project_type
 ):
@@ -1030,7 +1022,7 @@ async def test_help(doof):
 @pytest.mark.parametrize("has_checkboxes", [True, False])
 async def test_wait_for_checkboxes(
     mocker, doof, sleep_sync_mock, test_repo, has_checkboxes, mock_labels
-):  # pylint: disable=unused-argument,too-many-positional-arguments
+):
     """wait_for_checkboxes should poll github, parse checkboxes and see if all are checked"""
     org, repo = get_org_and_repo(test_repo.repo_url)
     channel_id = test_repo.channel_id
@@ -1114,10 +1106,10 @@ async def test_wait_for_checkboxes(
 
 async def test_wait_for_checkboxes_no_pr(
     mocker, doof, test_repo, mock_labels, sleep_sync_mock
-):  # pylint: disable=unused-argument
+):
     """wait_for_checkboxes should exit without error if the PR doesn't exist"""
     org, repo = get_org_and_repo(test_repo.repo_url)
-    mock_set, mock_get = mock_labels  # pylint: disable=unused-variable
+    mock_set, mock_get = mock_labels
     mock_set(label=WAITING_FOR_CHECKBOXES)
 
     pr = ReleasePR(
@@ -1139,7 +1131,6 @@ async def test_wait_for_checkboxes_no_pr(
     sleep_sync_mock.assert_called_once_with(10)
 
 
-# pylint: disable=too-many-arguments
 @pytest.mark.parametrize(
     "repo_info, has_release_pr, has_expected",
     [
@@ -1190,9 +1181,7 @@ async def test_startup(doof, mocker, repo_info, has_release_pr, has_expected):
         assert run_release_lifecycle_mock.called is False
 
 
-async def test_wait_for_deploy_rc(
-    doof, test_repo, mocker, mock_labels
-):  # pylint: disable=unused-argument
+async def test_wait_for_deploy_rc(doof, test_repo, mocker, mock_labels):
     """Bot._wait_for_deploy_prod should wait until repo has been deployed to RC"""
     wait_for_deploy_mock = mocker.async_patch("bot.wait_for_deploy")
     org, repo = get_org_and_repo(test_repo.repo_url)
@@ -1209,7 +1198,7 @@ async def test_wait_for_deploy_rc(
     )
     wait_for_checkboxes_sync_mock = mocker.async_patch("bot.Bot.wait_for_checkboxes")
 
-    await doof._wait_for_deploy_rc(  # pylint: disable=protected-access
+    await doof._wait_for_deploy_rc(
         repo_info=test_repo, manager="me", release_pr=release_pr
     )
 
@@ -1233,9 +1222,7 @@ async def test_wait_for_deploy_rc(
     )
 
 
-async def test_wait_for_deploy_prod(
-    doof, test_repo, mocker, mock_labels
-):  # pylint: disable=unused-argument
+async def test_wait_for_deploy_prod(doof, test_repo, mocker, mock_labels):
     """Bot._wait_for_deploy_prod should wait until repo has been deployed to production"""
     wait_for_deploy_mock = mocker.async_patch("bot.wait_for_deploy")
     version = "1.2.345"
@@ -1247,7 +1234,7 @@ async def test_wait_for_deploy_prod(
         "version", "https://github.com/org/repo/pulls/123456", "body", 123456, False
     )
 
-    await doof._wait_for_deploy_prod(  # pylint: disable=protected-access
+    await doof._wait_for_deploy_prod(
         repo_info=test_repo, manager="me", release_pr=release_pr
     )
 
@@ -1388,7 +1375,7 @@ async def test_start_new_releases(
     expected_version,
     has_release_pr,
     has_new_commits,
-):  # pylint: disable=too-many-positional-arguments
+):
     """start new releases command should iterate through releases and start ones without an existing PR"""
     old_version = "1.2.3"
     default_branch = "default"

conftest.py

@@ -58,7 +58,6 @@
 )
 
 
-# pylint: disable=redefined-outer-name, unused-argument
 @pytest.fixture
 def test_repo_directory():
     """Helper function to make a repo for testing"""
@@ -130,7 +129,7 @@ def timezone():
 
 
 @pytest.fixture
-def mocker(mocker):  # pylint: disable=redefined-outer-name
+def mocker(mocker):
     """Override to add async_patch"""
 
     def async_patch(*args, **kwargs):

finish_release_test.py

@@ -24,7 +24,6 @@
 pytestmark = pytest.mark.asyncio
 
 
-# pylint: disable=unused-argument, redefined-outer-name
 async def test_check_release_tag(test_repo_directory):
     """check_release_tag should error if the most recent release commit doesn't match the version given"""
     await check_call(
@@ -88,7 +87,6 @@ async def test_tag_release(mocker, test_repo_directory):
     )
 
 
-# pylint: disable=too-many-locals
 async def test_finish_release(mocker, timezone, test_repo_directory, test_repo):
     """finish_release should tag, merge and push the release"""
     token = "token"

github.py

@@ -86,9 +86,7 @@ def github_auth_headers(github_access_token):
     }
 
 
-async def create_pr(
-    *, github_access_token, repo_url, title, body, head, base
-):  # pylint: disable=too-many-arguments
+async def create_pr(*, github_access_token, repo_url, title, body, head, base):
     """
     Create a pull request
 

lib.py

@@ -299,8 +299,9 @@ async def virtualenv(python_interpreter, env):
             cwd=virtualenv_dir,
         )
         output = output_bytes.decode()
-        yield virtualenv_dir, dict(
-            line.split("=", 1) for line in output.splitlines() if "=" in line
+        yield (
+            virtualenv_dir,
+            dict(line.split("=", 1) for line in output.splitlines() if "=" in line),
         )
 
 

publish.py

@@ -40,9 +40,7 @@ async def upload_to_pypi(project_dir):
             )
 
 
-async def upload_with_twine(
-    *, project_dir, virtualenv_dir, environ
-):  # pylint: disable=too-many-locals
+async def upload_with_twine(*, project_dir, virtualenv_dir, environ):
     """
     Upload a version of a project to PYPI