Skip to content

Commit 6d486bd

Browse files
committed
ruff format, fix workflows
1 parent 0f01567 commit 6d486bd

8 files changed

Lines changed: 18 additions & 19 deletions

File tree

.github/workflows/checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
- name: Install dependencies
5858
run: |
5959
python -m pip install -U pip setuptools
60-
pip install -e .[dev]
60+
pip install -e .[dev,web]
6161
6262
- name: Ruff
6363
run: ruff format --check
@@ -105,7 +105,7 @@ jobs:
105105
- name: Install dependencies
106106
run: |
107107
python -m pip install -U pip setuptools
108-
pip install -e .[dev]
108+
pip install -e .[dev,web]
109109
110110
- name: Ruff
111111
run: ruff check --target-version py311 .

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Install dependencies
2727
run: |
2828
python -m pip install -U pip setuptools
29-
pip install .[docs]
29+
pip install .[docs,web]
3030
3131
- name: Build docs
3232
run: |

aethersprite/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,9 @@ async def _load_ext(ext: str, package: str | None = None):
213213
async def entrypoint():
214214
token = config["bot"].get("token", environ.get("DISCORD_TOKEN", None))
215215
# need credentials
216-
assert (
217-
token is not None
218-
), "bot.token not in config and DISCORD_TOKEN not in env variables"
216+
assert token is not None, (
217+
"bot.token not in config and DISCORD_TOKEN not in env variables"
218+
)
219219
# for any commands or scheduled tasks, etc. that need random numbers
220220
seed()
221221
bot.remove_command("help")

aethersprite/common.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,20 +173,20 @@ def seconds_to_str(ts):
173173

174174
if seconds >= DAY:
175175
days = floor(seconds / DAY)
176-
until.append(f'{days} day{"s" if days > 1 else ""}')
176+
until.append(f"{days} day{'s' if days > 1 else ''}")
177177
seconds = seconds % DAY
178178

179179
if seconds >= HOUR:
180180
hours = floor(seconds / HOUR)
181-
until.append(f'{hours} hour{"s" if hours > 1 else ""}')
181+
until.append(f"{hours} hour{'s' if hours > 1 else ''}")
182182
seconds = seconds % HOUR
183183

184184
if seconds >= MINUTE:
185185
minutes = floor(seconds / MINUTE)
186-
until.append(f'{minutes} minute{"s" if minutes > 1 else ""}')
186+
until.append(f"{minutes} minute{'s' if minutes > 1 else ''}")
187187
seconds = seconds % MINUTE
188188

189189
if seconds > 0:
190-
until.append(f'{seconds} second{"s" if seconds > 1 else ""}')
190+
until.append(f"{seconds} second{'s' if seconds > 1 else ''}")
191191

192192
return ", ".join(until)

aethersprite/extensions/base/greet.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ async def on_member_join(member: Member):
2727

2828
channel = [c for c in member.guild.channels if c.name == chan_setting][0]
2929
log.info(
30-
f"Greeting new member {member} in {member.guild.name} "
31-
f"#{channel.name}"
30+
f"Greeting new member {member} in {member.guild.name} #{channel.name}"
3231
)
3332
await channel.send( # type: ignore
3433
msg_setting.format(

aethersprite/extensions/base/poll.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def _get_embed(poll: dict):
107107
open = "open" if poll["open"] else "closed"
108108
prohib_text = "Close" if poll["open"] else "Open"
109109
embed = Embed(
110-
title=f':bar_chart: {poll["prompt"] or "Poll"}',
110+
title=f":bar_chart: {poll['prompt'] or 'Poll'}",
111111
description=f"Poll is: {open}",
112112
color=Color.blue(),
113113
)
@@ -126,9 +126,9 @@ def _get_embed(poll: dict):
126126
left = 20 - pct
127127
bar = f"{SOLID_BLOCK * pct}{SHADE_BLOCK * left}"
128128
embed.add_field(
129-
name=f'{key} {opt["text"]}',
129+
name=f"{key} {opt['text']}",
130130
inline=False,
131-
value=f'{bar} {opt["count"]} ({rawpct}%)',
131+
value=f"{bar} {opt['count']} ({rawpct}%)",
132132
)
133133

134134
return embed
@@ -164,11 +164,11 @@ async def _update_poll(
164164
verb = "voted" if adjustment > 0 else "retracted vote"
165165

166166
if acted:
167-
log.info(f'{member} {verb} for {emoji} - {poll["prompt"]}')
167+
log.info(f"{member} {verb} for {emoji} - {poll['prompt']}")
168168
else:
169169
log.warn(
170170
f"Ignored vote for {emoji} by {member} in {message.id} - "
171-
f'{poll["prompt"]} (reacts are out of sync)'
171+
f"{poll['prompt']} (reacts are out of sync)"
172172
)
173173

174174
await message.edit(embed=_get_embed(poll))

aethersprite/extensions/base/roles.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ async def catalog(ctx: Context):
145145

146146
if roles_ is None or len(roles_) == 0:
147147
await ctx.send(
148-
":person_shrugging: There are no available " "self-service roles."
148+
":person_shrugging: There are no available self-service roles."
149149
)
150150
log.warn(
151151
f"{ctx.author} attempted to post roles catalog, but no roles "

aethersprite/extensions/base/yeet.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ async def list(
163163
output = "None"
164164

165165
log.info(
166-
f'{ctx.author} viewed {"server " if server else""}yeet '
166+
f"{ctx.author} viewed {'server ' if server else ''}yeet "
167167
f"list in {channel}"
168168
)
169169
await ctx.send(f":v: **{output}**")

0 commit comments

Comments
 (0)