ci: automate tests with python 3.12 (#77)

* ci: automate tests with python 3.12 * build: remove depreciated update script * build(deps): update ruff
natelandau · Oct 2, 2023 · 6cd48f5 · 6cd48f5
1 parent 132af28
commit 6cd48f5
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 190 deletions.
diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml
@@ -38,7 +38,7 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                python-version: ["3.11"]
+                python-version: ["3.11", "3.12"]
         steps:
             - name: Harden Security Runner
               uses: step-security/harden-runner@v2

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -59,7 +59,7 @@ repos:
             entry: yamllint --strict --config-file .yamllint.yml
 
     - repo: "https://github.com/charliermarsh/ruff-pre-commit"
-      rev: "v0.0.291"
+      rev: "v0.0.292"
       hooks:
           - id: ruff
             args: ["--extend-ignore", "I001,D301,D401", "--preview"]

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -27,9 +27,9 @@
         py-cord       = "^2.4.1"
         python        = "^3.11"
         python-dotenv = "^1.0.0"
+        rich          = "^13.6.0"
         semver        = "^3.0.1"
         typer         = { extras = ["all"], version = "^0.9.0" }
-    rich = "^13.6.0"
 
     [tool.poetry.group.test.dependencies]
         dirty-equals           = "^0.6.0"
@@ -48,7 +48,7 @@
         pdoc           = "^14.0.0"
         poethepoet     = "^0.22.1"
         pre-commit     = "^3.4.0"
-        ruff           = "^0.0.291"
+        ruff           = "^0.0.292"
         shellcheck-py  = "^0.9.0.5"
         types-aiofiles = "^23.2.0.0"
         typos          = "^1.16.11"
@@ -297,7 +297,7 @@
         help = "Lint this package"
 
         [[tool.poe.tasks.lint.sequence]]
-            shell = "ruff --no-fix src/"
+            shell = "ruff --preview --no-fix src/"
 
         [[tool.poe.tasks.lint.sequence]]
             shell = "black --check src/ tests/"

diff --git a/scripts/update_dependencies.py b/scripts/update_dependencies.py
diff --git a/src/valentina/cogs/admin.py b/src/valentina/cogs/admin.py
@@ -228,7 +228,7 @@ async def massban(
             return
 
         # Confirm the action
-        title = f"Mass ban {count} {p.plural_noun('member',count)} from this guild"
+        title = f"Mass ban {count} {p.plural_noun('member', count)} from this guild"
         is_confirmed, confirmation_response_msg = await confirm_action(
             ctx, title, description=reason, hidden=hidden
         )
@@ -604,7 +604,7 @@ async def purge_bot_messages(
             count = len(await purge(limit=limit, reason=reason, check=lambda m: m.author.bot))
             await present_embed(
                 ctx,
-                title=f"Purged `{count}` bot {p.plural_noun('message',count)} in this channel",
+                title=f"Purged `{count}` bot {p.plural_noun('message', count)} in this channel",
                 level="warning",
                 ephemeral=True,
             )
@@ -646,7 +646,7 @@ async def purge_containing(
             )
             await present_embed(
                 ctx,
-                title=f"Purged `{count}` {p.plural_noun('message',count)} containing `{phrase}` in this channel",
+                title=f"Purged `{count}` {p.plural_noun('message', count)} containing `{phrase}` in this channel",
                 level="warning",
                 ephemeral=True,
             )

diff --git a/src/valentina/models/statistics.py b/src/valentina/models/statistics.py
@@ -120,12 +120,12 @@ def get_text(self, with_title: bool = True, with_help: bool = True) -> str:
         msg += f"""\
 ```python
 Total Rolls: {'.':.<{25 - 12}} {self.total_rolls}
-Critical Success Rolls: {'.':.<{25 -23}} {self.criticals:<3} ({self.criticals / self.total_rolls * 100:.2f}%)
+Critical Success Rolls: {'.':.<{25 - 23}} {self.criticals:<3} ({self.criticals / self.total_rolls * 100:.2f}%)
 Successful Rolls: {'.':.<{25 - 17}} {self.successes:<3} ({self.successes / self.total_rolls * 100:.2f}%)
 Failed Rolls: {'.':.<{25 - 13}} {self.failures:<3} ({self.failures / self.total_rolls * 100:.2f}%)
 Botched Rolls: {'.':.<{25 - 14}} {self.botches:<3} ({self.botches / self.total_rolls * 100:.2f}%)
-Average Difficulty: {'.':.<{25 -19}} {self.average_difficulty}
-Average Pool Size: {'.':.<{25 -18}} {self.average_pool}
+Average Difficulty: {'.':.<{25 - 19}} {self.average_difficulty}
+Average Pool Size: {'.':.<{25 - 18}} {self.average_pool}
 ```
 """
 

diff --git a/src/valentina/utils/changelog_parser.py b/src/valentina/utils/changelog_parser.py
@@ -214,7 +214,7 @@ def get_embed_personality(self) -> discord.Embed:
             discord.Embed: The changelog embed.
         """
         # Create and populate the embed description
-        description = f"Valentina, your {random.choice(['honored','admired','distinguished','celebrated','hallowed','prestigious','acclaimed','favorite','friendly neighborhood','prized', 'treasured', 'number one','esteemed','venerated','revered','feared'])} {random.choice(BOT_DESCRIPTIONS)}, has {random.choice(['been granted new powers', 'leveled up','spent experience points','gained new abilities','been bitten by a radioactive spider', 'spent willpower points', 'been updated','squashed bugs and gained new features',])}!\n"
+        description = f"Valentina, your {random.choice(['honored', 'admired', 'distinguished', 'celebrated', 'hallowed', 'prestigious', 'acclaimed', 'favorite', 'friendly neighborhood', 'prized', 'treasured', 'number one', 'esteemed', 'venerated', 'revered', 'feared'])} {random.choice(BOT_DESCRIPTIONS)}, has {random.choice(['been granted new powers', 'leveled up', 'spent experience points', 'gained new abilities', 'been bitten by a radioactive spider', 'spent willpower points', 'been updated', 'squashed bugs and gained new features',])}!\n"
 
         # Loop through each version in the changelog
         for version, data in self.changelog_dict.items():

diff --git a/src/valentina/views/roll_display.py b/src/valentina/views/roll_display.py
@@ -64,13 +64,13 @@ def _add_trait_fields(self, embed: discord.Embed) -> discord.Embed:
         if self.trait_one and self.trait_two:
             embed.add_field(
                 name="**Rolled Traits**",
-                value=f"{self.trait_one.name}: `{self.trait_one_value} {p.plural_noun('die',self.trait_one_value)}`\n{self.trait_two.name}: `{self.trait_two_value} {p.plural_noun('die',self.trait_two_value)}`",
+                value=f"{self.trait_one.name}: `{self.trait_one_value} {p.plural_noun('die', self.trait_one_value)}`\n{self.trait_two.name}: `{self.trait_two_value} {p.plural_noun('die', self.trait_two_value)}`",
                 inline=False,
             )
         elif self.trait_one:
             embed.add_field(
                 name="**Rolled Traits**",
-                value=f"{self.trait_one.name}: `{self.trait_one_value} {p.plural_noun('die',self.trait_one_value)}`",
+                value=f"{self.trait_one.name}: `{self.trait_one_value} {p.plural_noun('die', self.trait_one_value)}`",
                 inline=False,
             )