Skip to content

Commit 6b3d090

Browse files
Merge branch 'main' into threads-with-friends
2 parents fabc7a8 + 0f1121e commit 6b3d090

6 files changed

Lines changed: 62 additions & 61 deletions

File tree

.github/workflows/check-build-deploy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ jobs:
232232

233233
steps:
234234
- name: Log in to the Container registry
235-
uses: docker/login-action@v3.3.0
235+
uses: docker/login-action@v3.4.0
236236
with:
237237
registry: ${{env.REGISTRY}}
238238
username: ${{github.actor}}

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ repos:
1111
- id: hadolint
1212

1313
- repo: https://github.com/renovatebot/pre-commit-hooks
14-
rev: 39.185.6
14+
rev: 39.194.0
1515
hooks:
1616
- id: renovate-config-validator
1717
args: [--strict]
1818
stages: [manual]
1919

2020
- repo: https://github.com/python-jsonschema/check-jsonschema
21-
rev: 0.31.2
21+
rev: 0.31.3
2222
hooks:
2323
- id: check-github-workflows
2424

@@ -74,15 +74,15 @@ repos:
7474
stages: [manual]
7575

7676
- repo: https://github.com/astral-sh/ruff-pre-commit
77-
rev: v0.9.9
77+
rev: v0.9.10
7878
hooks:
7979
- id: ruff
8080
args: [--fix]
8181

8282
- id: ruff-format
8383

8484
- repo: https://github.com/astral-sh/uv-pre-commit
85-
rev: 0.6.4
85+
rev: 0.6.5
8686
hooks:
8787
- id: uv-lock
8888
always_run: true

cogs/command_error.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,14 @@ async def on_application_command_error(
5252
error_code = error.original.ERROR_CODE
5353

5454
elif isinstance(error, CheckAnyFailure):
55-
if CommandChecks.is_interaction_user_in_main_guild_failure(error.checks[0]):
55+
# TODO: Remove type ignore comments once #349 is resolved # noqa: FIX002
56+
if CommandChecks.is_interaction_user_in_main_guild_failure(error.checks[0]): # type: ignore[arg-type]
5657
message = (
5758
f"You must be a member of the {self.bot.group_short_name} Discord server "
5859
"to use this command."
5960
)
6061

61-
elif CommandChecks.is_interaction_user_has_committee_role_failure(error.checks[0]):
62+
elif CommandChecks.is_interaction_user_has_committee_role_failure(error.checks[0]): # type: ignore[arg-type]
6263
# noinspection PyUnusedLocal
6364
committee_role_mention: str = "@Committee"
6465
with contextlib.suppress(CommitteeRoleDoesNotExistError):

config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ def _setup_env_variables(cls) -> None:
701701
are only stored after the input values have been validated.
702702
"""
703703
if cls._is_env_variables_setup:
704-
logging.warning("Environment variables have already been set up.")
704+
logger.warning("Environment variables have already been set up.")
705705
return
706706

707707
dotenv.load_dotenv()

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ main = [
1414
"matplotlib>=3.10",
1515
"mplcyberpunk>=0.7",
1616
"parsedatetime>=2.6",
17-
"py-cord>=2.6,<2.6.1", # TODO: Remove version limit once #349 is resolved
17+
"py-cord>=2.6",
1818
"python-dotenv>=1.0",
1919
"python-logging-discord-handler>=0.1",
2020
"typed_classproperties>=1.1.3",

0 commit comments

Comments
 (0)