ci: switch from black/isort to ruff (#37)

* ci: switch from black/isort to ruff
* fix: resolve ruff linting errors
* style: reformat with ruff

Author: pkazmier

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13"]
 
     steps:
       - uses: actions/checkout@v3
@@ -26,13 +26,12 @@ jobs:
           cache-dependency-path: pyproject.toml
 
       - name: Install (including dev dependencies)
-        run: pip install .[aws,azure,dev]
+        run: pip install .[aws,azure,dev] ruff
 
-      - name: Lint with flake8
-        run: flake8 . --count --show-source --statistics
+      - name: Lint and check formatting with Ruff
+        run: |
+          ruff check --extend-select I .
+          ruff format --check .
 
       - name: Test with pytest
         run: pytest
-
-      - name: Validate formatting with black
-        run: black --check --diff .

README.md

@@ -1,5 +1,5 @@
 [![ci](https://github.com/fidelity/awsrun/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/fidelity/awsrun/actions/workflows/ci.yml)
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 
 # awsrun & azurerun
 

src/awsrun/acctload.py

@@ -1061,7 +1061,6 @@ def __init__(
         no_verify=False,
         cache_path=None,
     ):
-
         session = requests.Session()
         session.mount("file://", FileAdapter())
 
@@ -1132,7 +1131,7 @@ def __eq__(self, other):
 
     def __repr__(self):
         pairs = (f"{k}={repr(v)}" for k, v in self._attrs.items())
-        return f'Account({", ".join(pairs)})'
+        return f"Account({', '.join(pairs)})"
 
     def __str__(self):
         if not self._str_template:
@@ -1151,7 +1150,7 @@ class AccountsNotFoundError(Exception):
 
     def __init__(self, missing_acct_ids):
         self.missing_acct_ids = missing_acct_ids
-        super().__init__(f'Account IDs not found: {", ".join(missing_acct_ids)}')
+        super().__init__(f"Account IDs not found: {', '.join(missing_acct_ids)}")
 
 
 class InvalidFormatTemplateError(Exception):

src/awsrun/cli.py

@@ -1116,7 +1116,7 @@ def _print_valid_commands(commands, out=sys.stdout):
 def _print_accounts(accts, out=sys.stdout):
     """Print the list of accounts."""
     count = len(accts)
-    print(f'{count} account{"s" if count != 1 else ""} selected:\n', file=out)
+    print(f"{count} account{'s' if count != 1 else ''} selected:\n", file=out)
     print(", ".join(str(a) for a in accts), file=out, end="\n\n")
 
 
@@ -1125,7 +1125,7 @@ def _ask_for_confirmation(accts):
     _print_accounts(accts, out=sys.stderr)
     print("Proceed (y/n)? ", flush=True, end="", file=sys.stderr)
     answer = input()
-    if not answer.lower() in ["y", "yes"]:
+    if answer.lower() not in ["y", "yes"]:
         print("Exiting", file=sys.stderr)
         sys.exit(0)
 

src/awsrun/commands/aws/list_igws.py

@@ -67,7 +67,7 @@ def regional_execute(self, session, acct, region):
                 file=out,
             )
             if attachments:
-                print(f' vpcs={", ".join(attachments)}', end="", file=out)
+                print(f" vpcs={', '.join(attachments)}", end="", file=out)
 
             print(file=out)
 

src/awsrun/commands/aws/list_lambdas.py

@@ -93,7 +93,7 @@ def regional_execute(self, session, acct, region):
                     by_role[fn["Role"]].append(fn)
                     continue
                 print(
-                    f'{acct}/{region}: name={fn["FunctionName"]} runtime={fn["Runtime"]} role={fn["Role"]} public={_is_public(fn)}',
+                    f"{acct}/{region}: name={fn['FunctionName']} runtime={fn['Runtime']} role={fn['Role']} public={_is_public(fn)}",
                     file=out,
                 )
 

src/awsrun/commands/aws/list_public_ips.py

@@ -76,7 +76,7 @@ def regional_execute(self, session, acct, region):
         # are processing.
         for (vpc_id, owner_id), ips in public_ips.items():
             print(
-                f'{acct}/{region}: id={vpc_id} owner={owner_id} ips={", ".join(ips)}',
+                f"{acct}/{region}: id={vpc_id} owner={owner_id} ips={', '.join(ips)}",
                 file=out,
             )
 

src/awsrun/plugins/accts/__init__.py

@@ -896,7 +896,6 @@ def instantiate(self, args):
 
         # Check and set auth options if using authentication.
         if args.loader_auth != "none":
-
             # Command line flags take priority
             if args.loader_username:
                 auth_options["username"] = args.loader_username

src/awsrun/plugins/accts/azure.py

@@ -20,12 +20,12 @@
 :  `AzureCLI` loads subscriptions and metadata for those subscriptions via the
 Azure CLI `az account list --all`  command.
 """
+
 import logging
 
 from awsrun.acctload import AzureCLIAccountLoader
 from awsrun.plugmgr import Plugin
 
-
 LOG = logging.getLogger(__name__)
 
 

src/awsrun/plugmgr.py

@@ -66,6 +66,7 @@
 `PluginManager.parse_args` as it will be called by `PluginManager.instantiate`
 if it was not already.
 """
+
 import importlib
 import logging
 from contextlib import suppress